Fixed .a('object') with nulls. Fixed english in error message.

Automattic · Feb 4, 2012 · 8c0efa1 · 8c0efa1
1 parent 4005823
commit 8c0efa1
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/expect.js b/expect.js
@@ -207,11 +207,17 @@
   Assertion.prototype.a =
   Assertion.prototype.an = function (type) {
     if ('string' == typeof type) {
+      // proper english in error msg
+      var n = /^[aeiou]/.test(type) ? 'n' : '';
+
       // typeof with support for 'array'
       this.assert(
-          'array' == type ? isArray(this.obj) : type == typeof this.obj
+          'array' == type ? isArray(this.obj) :
-        , 'expected ' + i(this.obj) + ' to be a ' + type
+            'object' == type
-        , 'expected ' + i(this.obj) + ' not to be a ' + type);
+              ? 'object' == typeof this.obj && null !== this.obj
+              : type == typeof this.obj
+        , 'expected ' + i(this.obj) + ' to be a' + n + ' ' + type
+        , 'expected ' + i(this.obj) + ' not to be a' + n + ' ' + type);
     } else {
       // instanceof
       var name = type.name || 'supplied constructor';