From 8241b8870d9fe31422a72bf259867c573fa71579 Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Fri, 17 Nov 2017 17:30:28 -0800
Subject: [PATCH] Depend on webcomponents and shadycss with shady-unscoped
 support

Disable multi-styles test until that feature is fully implemented in
ShadyCSS
---
 bower.json                          | 4 ++--
 test/runner.html                    | 2 +-
 test/unit/shady-unscoped-style.html | 5 -----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/bower.json b/bower.json
index 00fa332bf6..a3b4d2d31f 100644
--- a/bower.json
+++ b/bower.json
@@ -20,8 +20,8 @@
     "url": "https://github.com/Polymer/polymer.git"
   },
   "dependencies": {
-    "shadycss": "webcomponents/shadycss#^v1.0.0",
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^v1.0.2"
+    "shadycss": "webcomponents/shadycss#^v1.1.0",
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^v1.0.19"
   },
   "devDependencies": {
     "web-component-tester": "^v6.0.0",
diff --git a/test/runner.html b/test/runner.html
index 4ed70fb204..9c286554ac 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -75,7 +75,7 @@
       'unit/render-status.html',
       'unit/dir.html',
       'unit/shady-unscoped-style.html',
-      'unit/multi-style.html'
+      // 'unit/multi-style.html'
     ];
 
     // http://eddmann.com/posts/cartesian-product-in-javascript/
diff --git a/test/unit/shady-unscoped-style.html b/test/unit/shady-unscoped-style.html
index 2dfb58942f..d393fd2cc0 100644
--- a/test/unit/shady-unscoped-style.html
+++ b/test/unit/shady-unscoped-style.html
@@ -116,14 +116,9 @@
     });
 
     test('@apply does not apply under ShadyDOM for shady-unscoped styles', function() {
-      if (!window.ShadyDOM) {
-        this.skip();
-      }
       assertComputed(el1.$.fromStyle, '0px', 'margin-top');
       assertComputed(el2.$.fromStyle, '0px', 'margin-top');
     });
-
-
   });
 </script>
 </body>