Merge pull request #222 from unexpectedjs/ssimonsen/fail-on-invalid-s…

…tyles-in-lhs Fix: Validate style attributes on the RHS
unexpectedjs · Oct 26, 2018 · b96fa32 · b96fa32
2 parents f4a218f + 1d568a7
commit b96fa32
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -89,6 +89,20 @@ function isEnumeratedAttribute(attrName) {
   return attrName in enumeratedAttributeValues;
 }
 
+function validateStyles(expect, str) {
+  var invalidStyles = str.split(';').filter(function(part) {
+    return !/^\s*\w+\s*:\s*\w+\s*$|^$/.test(part);
+  });
+
+  if (invalidStyles.length > 0) {
+    expect.errorMode = 'nested';
+    expect.fail(
+      'Expectation contains invalid styles: {0}',
+      invalidStyles.join(';')
+    );
+  }
+}
+
 function styleStringToObject(str) {
   var styles = {};
 
@@ -1126,6 +1140,7 @@ module.exports = {
               } else if (attributeName === 'style') {
                 var expectedStyleObj;
                 if (typeof expectedValueByAttributeName.style === 'string') {
+                  validateStyles(expect, expectedValueByAttributeName.style);
                   expectedStyleObj = styleStringToObject(
                     expectedValueByAttributeName.style
                   );

diff --git a/test/index.spec.js b/test/index.spec.js
@@ -1849,6 +1849,34 @@ describe('unexpected-dom', function() {
         );
       });
 
+      it('should not fail for invalid style attributes on the LHS', function() {
+        return expect(
+          parseHtml('<div style="color; width: 120px;">hey</div>'),
+          'to satisfy',
+          parseHtml('<div style="width: 120px;">hey</div>')
+        );
+      });
+
+      it('should fail when the RHS has invalid styles', function() {
+        return expect(
+          function() {
+            return expect(
+              parseHtml('<div style="width: 120px;">hey</div>'),
+              'to satisfy',
+              parseHtml('<div style="color;background;width: 120px">hey</div>')
+            );
+          },
+          'to error',
+          'expected <div style="width: 120px">hey</div> to satisfy <div style="width: 120px">hey</div>\n' +
+            '\n' +
+            '<div\n' +
+            '  style="width: 120px" // expected <div style="width: 120px">hey</div>\n' +
+            "                       // to satisfy { name: 'div', attributes: { style: 'color;background;width: 120px' }, children: [ 'hey' ] }\n" +
+            "                       //   Expectation contains invalid styles: 'color;background'\n" +
+            '>hey</div>'
+        );
+      });
+
       it('should fail when the subject is missing an inline style', function() {
         return expect(
           function() {