bug fix in assertArray()

webcc · Nov 2, 2015 · b7d1b1d · b7d1b1d
1 parent ca28bef
commit b7d1b1d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/lib/typly.js b/lib/typly.js
@@ -135,13 +135,16 @@ module.exports = {
     },
     assertArray: function (value, fn)
     {
-        if (!this.isArray(value, fn))
+        if(arguments.length === 1)
         {
-            if(arguments.length === 1)
+            if(!this.isArray(value))
             {
                 throw createTypeError(value, 'Array');
             }
-            else
+        }
+        else
+        {
+            if (!this.isArray(value, fn))
             {
                 throw new TypeError('[tiply] Invalid comparison function or type used in array');
             }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "typly",
     "description": "Generic Javascript type checker",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "author": {
         "name": "Web Compliance Center",
         "email": "webcc@fit.fraunhofer.de"

diff --git a/test/ArrayTest.js b/test/ArrayTest.js
@@ -13,6 +13,10 @@ describe("typly#ArrayTest", () =>
             assert(typly.isArray(new Array()));
         });
         it("should return true for integer arrays", () =>
+        {
+            assert(typly.isArray([4, 8, 66]));
+        });
+        it("should return true for integer arrays", () =>
         {
             assert(typly.isArray([4, 8, 66], typly.isInteger.bind(typly)));
         });
@@ -23,6 +27,14 @@ describe("typly#ArrayTest", () =>
     });
     describe("#assertArray", () =>
     {
+        it("should return true for integer arrays", () =>
+        {
+            assert(typly.assertArray([4, 8, 66]));
+        });
+        it("should return true for integer arrays", () =>
+        {
+            assert(typly.assertArray([4, 8, 66], typly.isInteger.bind(typly)));
+        });
         it("should throw a TypeError for objects", () =>
         {
             assert.throws(() =>