Merge pull request #320 from jamescgibson/master

Make assert.epsilon fail for NaN actual value
vowsjs · Nov 6, 2014 · bc7cad0 · bc7cad0
2 parents 64857e3 + f5cec76
commit bc7cad0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/assert/macros.js b/lib/assert/macros.js
@@ -17,7 +17,9 @@ for (var key in messages) {
 }
 
 assert.epsilon = function (eps, actual, expected, message) {
-    if (Math.abs(actual - expected) > eps) {
+    if (isNaN(eps)) {
+        assert.fail(actual, expected, message || "cannot compare {actual} with {expected} \u00B1 NaN");
+    } else if (isNaN(actual) || Math.abs(actual - expected) > eps) {
         assert.fail(actual, expected, message || "expected {expected} \u00B1"+ eps +", but was {actual}");
     }
 };

diff --git a/test/assert-test.js b/test/assert-test.js
@@ -9,6 +9,12 @@ vows.describe('vows/assert').addBatch({
         },
         "`epsilon`": function() {
             assert.epsilon(1e-5, 0.1+0.2, 0.3);
+            assert.throws(function() {
+              assert.epsilon(1e-5, NaN, 0.3);
+            });
+            assert.throws(function() {
+              assert.epsilon(NaN, 1.0, 1.0);
+            });
         },
         "`match`": function () {
             assert.match("hello world", /^[a-z]+ [a-z]+$/);