Don't treat 'null' as an error when passed to async test callbacks.

rserp · Oct 31, 2013 · a26ea1f · a26ea1f
1 parent 5a22d2d
commit a26ea1f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/source/test/async_steps.js b/source/test/async_steps.js
@@ -35,7 +35,7 @@ Test.extend({
         },
 
         __runNextStep__: function(error) {
-          if (typeof error === 'object') return this.addError(error);
+          if (typeof error === 'object' && error !== null) return this.addError(error);
 
           var step = this.__stepQueue__.shift(), n;
 

diff --git a/source/test/unit/test_case.js b/source/test/unit/test_case.js
@@ -202,7 +202,7 @@ Test.Unit.extend({
 
           if (typeof asyncResult === 'string') asyncResult = new Error(asyncResult);
 
-          if (typeof asyncResult === 'object')
+          if (typeof asyncResult === 'object' && asyncResult !== null)
             onUncaughtError(asyncResult);
           else if (typeof asyncResult === 'function')
             self.exec(asyncResult, onSuccess, onError);