Improve coverage of 'to have items satisfying' and 'to have keys sati…

…sfying', removed dead code.
unexpectedjs · Apr 14, 2015 · 533ec97 · 533ec97
1 parent d30aba8
commit 533ec97
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/lib/assertions.js b/lib/assertions.js
@@ -434,12 +434,7 @@ module.exports = function (expect) {
                             } else {
                                 seenFirstRejected = true;
                             }
-                            output.i().text(key).text(': ');
-                            if (error._isUnexpected) {
-                                output.block(error.output);
-                            } else {
-                                output.block(output.clone().text(error.message));
-                            }
+                            output.i().text(key).text(': ').block(error.output);
                         }
                     });
                 });
@@ -503,12 +498,7 @@ module.exports = function (expect) {
                             } else {
                                 seenFirstRejected = true;
                             }
-                            output.i().text(key).text(': ');
-                            if (error._isUnexpected) {
-                                output.block(error.output);
-                            } else {
-                                output.block(output.clone().text(error.message));
-                            }
+                            output.i().text(key).text(': ').block(error.output);
                         }
                     });
                 });

diff --git a/test/unexpected.spec.js b/test/unexpected.spec.js
@@ -2404,7 +2404,24 @@ describe('unexpected', function () {
             expect([[1], [2]], 'to have items satisfying', 'to have items satisfying', 'to be a number');
         });
 
-        it('supports legacy legacy', function () {
+        it('formats non-Unexpected errors correctly', function () {
+            expect(function () {
+                expect([[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]], 'to have items satisfying', function (item) {
+                    expect.fail(function (output) {
+                        output.text('foo').nl().text('bar');
+                    });
+                });
+            }, 'to throw',
+                    'failed expectation in\n' +
+                    '[\n' +
+                    '  [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 ]\n' +
+                    ']:\n' +
+                    '  0: foo\n' +
+                    '     bar'
+            );
+        });
+
+        it('supports legacy "to be an array whose items satisfy"', function () {
             expect(['0', '1', '2', '3'], 'to be an array whose items satisfy', 'not to be a number');
         });