Revert "Tweaking output of the to satisfy on style"

This reverts commit a66edd7.
unexpectedjs · Mar 28, 2018 · e865fde · e865fde
1 parent 1dccc71
commit e865fde
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -696,7 +696,6 @@ module.exports = {
             if (typeof value === 'string') {
               value = getClassNamesFromAttributeValue(value);
             }
-
             return topLevelExpect(
               actualClasses.sort(),
               'to equal',
@@ -1010,7 +1009,6 @@ module.exports = {
             expectedAttributeNames.push(attributeName);
           });
 
-          expect.errorMode = 'diff';
           expectedAttributeNames.forEach(function(attributeName) {
             var attributeValue = subject.getAttribute(attributeName);
             var expectedAttributeValue =
@@ -1053,13 +1051,17 @@ module.exports = {
                 }
 
                 if (onlyAttributes) {
-                  return expect(
+                  return topLevelExpect(
                     attrs.style,
                     'to exhaustively satisfy',
                     expectedStyleObj
                   );
                 } else {
-                  return expect(attrs.style, 'to satisfy', expectedStyleObj);
+                  return topLevelExpect(
+                    attrs.style,
+                    'to satisfy',
+                    expectedStyleObj
+                  );
                 }
               } else if (expectedAttributeValue === true) {
                 topLevelExpect(
@@ -1080,7 +1082,6 @@ module.exports = {
               }
             });
           });
-          expect.errorMode = 'default';
 
           promiseByKey.attributePresence = expect.promise(function() {
             var attributeNamesExpectedToBeDefined = [];

diff --git a/test/index.spec.js b/test/index.spec.js
@@ -1617,7 +1617,9 @@ describe('unexpected-dom', function() {
           'expected <div style="width: 120px">hey</div> to satisfy <div style="color: tan;">hey</div>\n' +
             '\n' +
             '<div\n' +
-            '  style="width: 120px" // {\n' +
+            "  style=\"width: 120px\" // expected { width: '120px' } to satisfy { color: 'tan' }\n" +
+            '                       //\n' +
+            '                       // {\n' +
             "                       //   width: '120px'\n" +
             "                       //   // missing color: 'tan'\n" +
             '                       // }\n' +
@@ -1730,7 +1732,9 @@ describe('unexpected-dom', function() {
           'expected <div style="width: 120px">hey</div> to satisfy <div style="color: tan">hey</div>\n' +
             '\n' +
             '<div\n' +
-            '  style="width: 120px" // {\n' +
+            "  style=\"width: 120px\" // expected { width: '120px' } to satisfy { color: 'tan' }\n" +
+            '                       //\n' +
+            '                       // {\n' +
             "                       //   width: '120px'\n" +
             "                       //   // missing color: 'tan'\n" +
             '                       // }\n' +