before & after

azer · Feb 11, 2013 · 86e76d8 · 86e76d8
1 parent 7b4a856
commit 86e76d8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/testsuite.js b/lib/testsuite.js
@@ -85,12 +85,12 @@ function initArgs(testsuite){
   var args = undefined;
 
   function callInit(callback){
-    if(typeof testsuite.options.module.init != 'function'){
+    if(typeof testsuite.options.module.init != 'function' && typeof testsuite.options.module.before != 'function'){
       callback();
       return;
     }
 
-    testsuite.options.module.init(testsuite.options, callback);
+    ( testsuite.options.module.init || testsuite.options.module.before )(testsuite.options, callback);
   };
 
   return function(callback){
@@ -121,7 +121,7 @@ function filterTestFunctions(el){
 function newFinish(testsuite){
 
   function end(callback){
-    if( testsuite.options.module.end == undefined ){
+    if( testsuite.options.module.end == undefined && testsuite.options.module.after == undefined ){
       callback();
       return;
     }
@@ -130,7 +130,7 @@ function newFinish(testsuite){
       var args = [].concat(initArgs);
       args.push(callback);
 
-      testsuite.options.module.end.apply(undefined, args);
+      ( testsuite.options.module.after || testsuite.options.module.end ).apply(undefined, args);
     });
   }