added isEmpty and typeOf assertion macros

Author: cloudhead

lib/vows/macros.js

@@ -24,7 +24,9 @@ assert.ok = (function (callback) {
 })(assert.ok);
 
 assert.match = function (actual, expected, message) {
-    if (! actual.match(expected)) assert.fail(actual, expected, message || "expected {actual} to match {expected}", "match", assert.match);
+    if (! expected.test(actual)) {
+        assert.fail(actual, expected, message || "expected {actual} to match {expected}", "match", assert.match);
+    }
 };
 assert.matches = assert.match;
 
@@ -42,9 +44,37 @@ assert.include = function (actual, expected, message) {
 };
 assert.includes = assert.include;
 
+assert.isEmpty = function (actual, message) {
+    if ((isObject(actual) && Object.keys(actual).length > 0) || actual.length > 0) {
+        assert.fail(actual, 0, message || "expected {actual} to be empty", "length", assert.isEmpty);
+    }
+};
+
+assert.isArray = function (actual, message) {
+    assertTypeOf(actual, 'array', message || "expected {actual} to be an Array", assert.isArray);
+};
+assert.isObject = function (actual, message) {
+    assertTypeOf(actual, 'object', message || "expected {actual} to be an Object", assert.isObject);
+};
+assert.isNumber = function (actual, message) {
+    assertTypeOf(actual, 'number', message || "expected {actual} to be a Number", assert.isNumber);
+};
+assert.isString = function (actual, message) {
+    assertTypeOf(actual, 'string', message || "expected {actual} to be a String", assert.isString);
+};
+assert.typeOf = function (actual, expected, message) {
+    assertTypeOf(actual, expected, message, assert.typeOf);
+};
+
 //
 // Utility functions
 //
+function assertTypeOf(actual, expected, message, caller) {
+    if (typeOf(actual) !== expected) {
+        assert.fail(actual, expected, message || "expected {actual} to be of type {expected}", "typeOf", caller);
+    }
+};
+
 function isArray (obj) {
     return Array.isArray(obj);
 }
@@ -57,3 +87,17 @@ function isObject (obj) {
     return typeof(obj) === 'object' && obj instanceof Object && !isArray(obj);
 }
 
+// A better `typeof`
+function typeOf(value) {
+    var s = typeof(value),
+        types = [Object, Array, String, RegExp, Number, Function, Boolean, Date];
+
+    if (s === 'object' || s === 'function') {
+        if (value) {
+            types.forEach(function (t) {
+                if (value instanceof t) { s = t.name.toLowerCase() }
+            });
+        } else { s = 'null' }
+    }
+    return s;
+}

test/vows-test.js

@@ -34,6 +34,16 @@ vows.tell("Vows", {
         "testing inclusion": function (it) {
             assert.include(it, "world");
         },
+        "testing type": function (it) {
+            assert.typeOf(it, 'string');
+            assert.isArray([]);
+            assert.isObject({});
+        },
+        "testing emptiness": function (it) {
+            assert.isEmpty({});
+            assert.isEmpty([]);
+            assert.isEmpty("");
+        },
         "with a nested context": {
             setup: function (parent) {
                 this.state = 42;