add tests

Polymer · Feb 22, 2017 · 20de928 · 20de928
1 parent 2315547
commit 20de928
Show file tree

Hide file tree

Showing 5 changed files with 1,101 additions and 4 deletions.
diff --git a/src/lib/style-util.html b/src/lib/style-util.html
@@ -228,7 +228,7 @@
         for (var i=0, s; i < styles.length; i++) {
           s = styles[i];
           s.parentNode.insertBefore(
-            this._includesToFragment(s.getAttribute('include')), s.nextSibling);
+            this._includesToFragment(s.getAttribute('include')), s);
         }
       },
 
@@ -248,13 +248,14 @@
         var s$ = source.querySelectorAll('style');
         for (var i=0, s; i < s$.length; i++) {
           s = s$[i];
-          if (s.textContent) {
-            frag.appendChild(s.cloneNode(true));
-          }
           var include = s.getAttribute('include');
           if (include) {
             frag.appendChild(this._includesToFragment(include));
           }
+          if (s.textContent) {
+            frag.appendChild(s.cloneNode(true));
+          }
+
         }
       },
 

diff --git a/test/runner.html b/test/runner.html
@@ -58,6 +58,7 @@
       'unit/resolveurl.html',
       'unit/css-parse.html',
       'unit/styling-scoped.html',
+      'unit/preserve-style-include/styling-scoped.html',
       'unit/styling-extends.html',
       'unit/styling-remote.html',
       'unit/styling-cross-scope-var.html',

diff --git a/test/smoke/preserve-include.html b/test/smoke/preserve-include.html
@@ -16,6 +16,9 @@
         <style>
           :host {
             color: red;
+            --mixin: {
+              border: 2px solid tomato;
+            }
           }
         </style>
         <style></style>
@@ -50,6 +53,7 @@
           :host {
             display: block;
             background: green;
+            @apply --mixin;
           }
 
         </style>