Merge pull request #5288 from Polymer/5286-kschaaf-shady-tests-3.x

Fix shady test regressions (3.x)
Polymer · Jul 18, 2018 · 7071cd5 · 7071cd5
2 parents d387a46 + a78732f
commit 7071cd5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/test/unit/shady.html b/test/unit/shady.html
@@ -456,7 +456,8 @@
 }
 
 function getComposedHTML(node) {
-  return ShadyDOM.nativeTree.innerHTML(node);
+  // Ignore shady CSS scoping
+  return ShadyDOM.nativeTree.innerHTML(node).replace(/ class="[^"]*"/g, '');
 }
 
 function getComposedChildAtIndex(node, index) {

diff --git a/test/unit/styling-cross-scope-var.html b/test/unit/styling-cross-scope-var.html
@@ -769,7 +769,7 @@
 });
 
 test('instances of scoped @keyframes', function(done) {
-  if (navigator.userAgent.match(/Safari\/60(3|4)/) && ShadyCSS.nativeCss && ShadyCSS.nativeShadow) {
+  if (navigator.userAgent.match(/Safari/) && ShadyCSS.nativeCss && ShadyCSS.nativeShadow) {
     // `:nth-of-type` is broken in shadow roots on Safari 10.1
     // https://bugs.webkit.org/show_bug.cgi?id=166748
     this.skip();