Merge pull request #5055 from Polymer/edge-16

Add Edge 16 Testing
Polymer · Jan 20, 2018 · 6c5aac0 · 6c5aac0
2 parents ecd1ba3 + 09897d1
commit 6c5aac0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/test/unit/custom-style.html b/test/unit/custom-style.html
@@ -483,6 +483,11 @@
         assertComputed(el, '11px', 'right');
         assertComputed(el, '12px', 'top');
 
+        // Avoid Edge 16 bug with CSS Custom Properties and Fonts.
+        if (navigator.userAgent.match('Edge/16') && (!window.ShadyCSS || window.ShadyCSS.nativeCss)) {
+          return;
+        }
+
         // Because FireFox and Chrome parse font-family differently...
         var computed = getComputedStyle(el);
         assert.equal(computed['font-family'].replace(/['"]+/g, ''), 'Varela font');

diff --git a/test/unit/styling-cross-scope-apply.html b/test/unit/styling-cross-scope-apply.html
@@ -588,6 +588,11 @@
   });
 
   test('mixins apply to @keyframe rules', function(done) {
+    if (navigator.userAgent.match('Edge/16') && (!window.ShadyCSS || window.ShadyCSS.nativeCss)) {
+      // skip test due to missing variable support in keyframes
+      // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/12084341/
+      this.skip();
+    }
     var xKeyframes1 = styled.$.keyframes1;
     var xKeyframes2 = styled.$.keyframes2;
     var completed = 0;

diff --git a/test/unit/styling-scoped.html b/test/unit/styling-scoped.html
@@ -859,6 +859,11 @@
     });
 
     test('keyframes change scope', function(done) {
+      if (navigator.userAgent.match('Edge/16') && (!window.ShadyCSS || window.ShadyCSS.nativeCss)) {
+        // skip test due to missing variable support in keyframes
+        // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/12084341/
+        this.skip();
+      }
       var xKeyframes = styled.$.keyframes;
 
       var onAnimationEnd = function() {

diff --git a/util/travis-sauce-test.sh b/util/travis-sauce-test.sh
@@ -9,4 +9,4 @@
 # subject to an additional IP rights grant found at http:polymer.github.io/PATENTS.txt
 #
 set -x
-wct -s 'windows 10/microsoftedge@14' -s 'windows 10/microsoftedge@15' -s 'windows 8.1/internet explorer@11' -s 'os x 10.11/safari@9' -s 'macos 10.12/safari@10' -s 'macos 10.13/safari@11' -s 'Linux/chrome@41'
+wct -s 'windows 10/microsoftedge@14' -s 'windows 10/microsoftedge@15' -s 'windows 10/microsoftedge@16' -s 'windows 8.1/internet explorer@11' -s 'os x 10.11/safari@9' -s 'macos 10.12/safari@10' -s 'macos 10.13/safari@11' -s 'Linux/chrome@41'