Merge ae3c0c6 into ac3e9d3

unexpectedjs · May 7, 2017 · 155eb14 · 155eb14
2 parents ac3e9d3 + ae3c0c6
commit 155eb14
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/lib/Unexpected.js b/lib/Unexpected.js
@@ -1126,15 +1126,22 @@ Unexpected.prototype._expect = function expect(subject, testDescriptionString) {
 
         if (!assertionRule) {
             var tokens = testDescriptionString.split(' ');
-            for (var n = tokens.length - 1; n > 0 ; n -= 1) {
+            OUTER: for (var n = tokens.length - 1; n > 0 ; n -= 1) {
                 var prefix = tokens.slice(0, n).join(' ');
-                var argsWithAssertionPrepended = [ tokens.slice(n).join(' ') ].concat(args);
+                var remainingTokens = tokens.slice(n);
+                var argsWithAssertionPrepended = [ remainingTokens.join(' ') ].concat(args);
                 assertionRule = that.lookupAssertionRule(subject, prefix, argsWithAssertionPrepended, true);
                 if (assertionRule) {
-                    // Great, found the longest prefix of the string that yielded a suitable assertion for the given subject and args
-                    testDescriptionString = prefix;
-                    args = argsWithAssertionPrepended;
-                    break;
+                    // Found the longest prefix of the string that yielded a suitable assertion for the given subject and args
+                    // To avoid bogus error messages when shifting later (#394) we require some prefix of the remaining tokens
+                    // to be a valid assertion name:
+                    for (var i = 1 ; i < remainingTokens.length ; i += 1) {
+                        if (that.assertions.hasOwnProperty(remainingTokens.slice(0, i + 1).join(' '))) {
+                            testDescriptionString = prefix;
+                            args = argsWithAssertionPrepended;
+                            break OUTER;
+                        }
+                    }
                 }
             }
             if (!assertionRule) {

diff --git a/test/unexpected.spec.js b/test/unexpected.spec.js
@@ -863,6 +863,20 @@ describe('unexpected', function () {
                 );
             });
         });
+
+        // https://github.com/unexpectedjs/unexpected/issues/394
+        it('should produce a meaningful error message when the last half of a compound assertion is not a valid assertion name', function () {
+            expect(function () {
+                expect(function () {}, 'when called with', 'M1', 'to throw a', SyntaxError);
+            }, 'to throw',
+                "expected function () {}\n" +
+                "when called with 'M1', 'to throw a', function SyntaxError() { /* native code */ }\n" +
+                "  The assertion does not have a matching signature for:\n" +
+                "    <function> when called with <string> <string> <function>\n" +
+                "  did you mean:\n" +
+                "    <function> [when] called with <array-like> <assertion?>"
+            );
+        });
     });
 
     describe('#output', function () {