Update tests for at rules

8 years ago · 82cb2dc07c
2 changed files with 43 additions and 13 deletions
--- a/src/parser/model/ParserCss.js
+++ b/src/parser/model/ParserCss.js
@ -117,7 +117,7 @@ module.exports = config => ({

        for (var s = 0, lens = subRules.length; s < lens; s++) {
          var subRule = subRules[s];
-          subRule.mediaText = condition;
+          condition && (subRule.mediaText = condition);
          subRule.atRuleType = atRules[type];
        }
        result = result.concat(subRules);
@ -180,22 +180,15 @@ module.exports = config => ({
   * @return {Object|Array<Object>}
   */
  parse(str) {
-    var el = document.createElement('style');
-    /*
-    el.innerHTML = ".cssClass {border: 2px solid black; background-color: blue;} " +
-    ".red, .red2 {color:red; padding:5px} .test1.red {color:black} .red:hover{color: blue} " +
-    "@media screen and (min-width: 480px){ .red{color:white} }";
-    */
+    const el = document.createElement('style');
    el.innerHTML = str;

-    // There is no .sheet without adding it to the <head>
+    // There is no .sheet before adding it to the <head>
    document.head.appendChild(el);
-    var sheet = el.sheet;
+    const sheet = el.sheet;
    document.head.removeChild(el);
-    var result = this.parseNode(sheet);
+    const result = this.parseNode(sheet);

-    if (result.length == 1) result = result[0];
-
-    return result;
+    return result.length == 1 ? result[0] : result;
  }
 });
--- a/test/specs/parser/model/ParserCss.js
+++ b/test/specs/parser/model/ParserCss.js
@ -238,6 +238,43 @@ module.exports = {
        };
        expect(obj.parse(str)).toEqual(result);
      });
+
+      // Can't test keyframes https://github.com/NV/CSSOM/issues/95
+      it.skip('Parse rule with a keyframes at-rule', () => {
+        var str = `@keyframes {
+          from {opacity: 0;}
+          to {opacity: 1;}
+        }`;
+        var result = [
+          {
+            selectors: [],
+            atRuleType: 'keyframes',
+            selectorsAdd: 'from',
+            style: { opacity: '0' }
+          },
+          {
+            selectors: [],
+            atRuleType: 'keyframes',
+            selectorsAdd: 'to',
+            style: { opacity: '1' }
+          }
+        ];
+        expect(obj.parse(str)).toEqual(result);
+      });
+
+      it('Parse rule with font-face at-rule', () => {
+        var str = `@font-face {
+         font-family: "Open Sans";
+        }`;
+        var result = {
+          selectors: [],
+          selectorsAdd: '',
+          atRuleType: 'font-face',
+          singleAtRule: 1,
+          style: { 'font-family': '"Open Sans"' }
+        };
+        expect(obj.parse(str)).toEqual(result);
+      });
    });
  }
 };