Merge pull request #348 from unexpectedjs/feature/disallowAnyPlus

to have (items|values|keys) satisfying: Only allow one <any> as the value, not <any+>
unexpectedjs · Nov 18, 2016 · 92cc275 · 92cc275
2 parents d4fb296 + 02a183c
commit 92cc275
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 12 deletions.
diff --git a/lib/assertions.js b/lib/assertions.js
@@ -694,9 +694,9 @@ module.exports = function (expect) {
     });
 
     expect.addAssertion([
-        '<object> to have values [exhaustively] satisfying <any+>',
+        '<object> to have values [exhaustively] satisfying <any>',
         '<object> to have values [exhaustively] satisfying <assertion>',
-        '<object> to be (a map|a hash|an object) whose values [exhaustively] satisfy <any+>',
+        '<object> to be (a map|a hash|an object) whose values [exhaustively] satisfy <any>',
         '<object> to be (a map|a hash|an object) whose values [exhaustively] satisfy <assertion>'
     ], function (expect, subject, nextArg) {
         expect.errorMode = 'nested';
@@ -739,9 +739,9 @@ module.exports = function (expect) {
     });
 
     expect.addAssertion([
-        '<array-like> to have items [exhaustively] satisfying <any+>',
+        '<array-like> to have items [exhaustively] satisfying <any>',
         '<array-like> to have items [exhaustively] satisfying <assertion>',
-        '<array-like> to be an array whose items [exhaustively] satisfy <any+>',
+        '<array-like> to be an array whose items [exhaustively] satisfy <any>',
         '<array-like> to be an array whose items [exhaustively] satisfy <assertion>'
     ], function (expect, subject) { // ...
         var extraArgs = Array.prototype.slice.call(arguments, 2);
@@ -766,9 +766,9 @@ module.exports = function (expect) {
     });
 
     expect.addAssertion([
-        '<object> to have keys satisfying <any+>',
+        '<object> to have keys satisfying <any>',
         '<object> to have keys satisfying <assertion>',
-        '<object> to be (a map|a hash|an object) whose (keys|properties) satisfy <any+>',
+        '<object> to be (a map|a hash|an object) whose (keys|properties) satisfy <any>',
         '<object> to be (a map|a hash|an object) whose (keys|properties) satisfy <assertion>'
     ], function (expect, subject) {
         var extraArgs = Array.prototype.slice.call(arguments, 2);

diff --git a/test/assertions/to-have-items-satisfying.spec.js b/test/assertions/to-have-items-satisfying.spec.js
@@ -6,7 +6,17 @@ describe('to have items satisfying assertion', function () {
         }, 'to throw',
                "expected [ 1, 2, 3 ] to have items satisfying\n" +
                "  No matching assertion, did you mean:\n" +
-               "  <array-like> to have items [exhaustively] satisfying <any+>\n" +
+               "  <array-like> to have items [exhaustively] satisfying <any>\n" +
+               "  <array-like> to have items [exhaustively] satisfying <assertion>");
+    });
+
+    it('does not accept a fourth argument', function () {
+        expect(function () {
+            expect([1], 'to have items satisfying', 1, 2);
+        }, 'to throw',
+               "expected [ 1 ] to have items satisfying 1, 2\n" +
+               "  No matching assertion, did you mean:\n" +
+               "  <array-like> to have items [exhaustively] satisfying <any>\n" +
                "  <array-like> to have items [exhaustively] satisfying <assertion>");
     });
 
@@ -16,7 +26,7 @@ describe('to have items satisfying assertion', function () {
         }, 'to throw',
                "expected 42 to have items satisfying function (item) {}\n" +
                "  No matching assertion, did you mean:\n" +
-               "  <array-like> to have items [exhaustively] satisfying <any+>\n" +
+               "  <array-like> to have items [exhaustively] satisfying <any>\n" +
                "  <array-like> to have items [exhaustively] satisfying <assertion>");
     });
 

diff --git a/test/assertions/to-have-keys-satisfying.spec.js b/test/assertions/to-have-keys-satisfying.spec.js
@@ -6,7 +6,17 @@ describe('to have keys satisfying assertion', function () {
         }, 'to throw',
                "expected [ 1, 2, 3 ] to have keys satisfying\n" +
                "  No matching assertion, did you mean:\n" +
-               "  <object> to have keys satisfying <any+>\n" +
+               "  <object> to have keys satisfying <any>\n" +
+               "  <object> to have keys satisfying <assertion>");
+    });
+
+    it('does not accept a fourth argument', function () {
+        expect(function () {
+            expect([1], 'to have keys satisfying', 0, 1);
+        }, 'to throw',
+               "expected [ 1 ] to have keys satisfying 0, 1\n" +
+               "  No matching assertion, did you mean:\n" +
+               "  <object> to have keys satisfying <any>\n" +
                "  <object> to have keys satisfying <assertion>");
     });
 
@@ -16,7 +26,7 @@ describe('to have keys satisfying assertion', function () {
         }, 'to throw',
                "expected 42 to have keys satisfying function (key) {}\n" +
                "  No matching assertion, did you mean:\n" +
-               "  <object> to have keys satisfying <any+>\n" +
+               "  <object> to have keys satisfying <any>\n" +
                "  <object> to have keys satisfying <assertion>");
     });
 

diff --git a/test/assertions/to-have-values-satisfying.spec.js b/test/assertions/to-have-values-satisfying.spec.js
@@ -6,7 +6,17 @@ describe('to have values satisfying assertion', function () {
         }, 'to throw',
                "expected [ 1, 2, 3 ] to have values satisfying\n" +
                "  No matching assertion, did you mean:\n" +
-               "  <object> to have values [exhaustively] satisfying <any+>\n" +
+               "  <object> to have values [exhaustively] satisfying <any>\n" +
+               "  <object> to have values [exhaustively] satisfying <assertion>");
+    });
+
+    it('does not accept a fourth argument', function () {
+        expect(function () {
+            expect([1], 'to have values satisfying', 1, 2);
+        }, 'to throw',
+               "expected [ 1 ] to have values satisfying 1, 2\n" +
+               "  No matching assertion, did you mean:\n" +
+               "  <object> to have values [exhaustively] satisfying <any>\n" +
                "  <object> to have values [exhaustively] satisfying <assertion>");
     });
 
@@ -16,7 +26,7 @@ describe('to have values satisfying assertion', function () {
         }, 'to throw',
                "expected 42 to have values satisfying function (value) {}\n" +
                "  No matching assertion, did you mean:\n" +
-               "  <object> to have values [exhaustively] satisfying <any+>\n" +
+               "  <object> to have values [exhaustively] satisfying <any>\n" +
                "  <object> to have values [exhaustively] satisfying <assertion>");
     });