Include more styling tests under ShadowDOM.

Fix custom-style media query test to work under both shadow/shady.
Polymer · Jan 5, 2016 · 33a24bb · 33a24bb
1 parent 555252b
commit 33a24bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/test/runner.html b/test/runner.html
@@ -56,10 +56,8 @@
       'unit/styling-remote.html',
       'unit/styling-cross-scope-var.html',
       'unit/styling-cross-scope-apply.html',
-      // TODO(sorvell): disable until this Chrome bug is addressed:
-      // https://code.google.com/p/chromium/issues/detail?id=525280
-      // 'unit/styling-cross-scope-var.html?dom=shadow',
-      // 'unit/styling-cross-scope-apply.html?dom=shadow',
+      'unit/styling-cross-scope-var.html?dom=shadow',
+      'unit/styling-cross-scope-apply.html?dom=shadow',
       'unit/styling-cross-scope-unknown-host.html',
       'unit/custom-style.html',
       'unit/custom-style.html?dom=shadow',

diff --git a/test/unit/custom-style.html b/test/unit/custom-style.html
@@ -155,7 +155,7 @@
 
   <div class="foo"></div>
 
-  <div class="foo--bar style-scope"></div>
+  <div class="foo--bar"></div>
 
   <dom-module id="x-baz">
     <style>
@@ -489,7 +489,7 @@
       });
 
       test('BEM-like CSS selectors under media queries', function() {
-        assertComputed(document.querySelector('.foo--bar'), '3px');
+        assertComputed(document.querySelector('.foo--bar'), '20px');
       });
 
     });