From 2ac2c6e4bdea4a65c7fb52c851c40fa672dc7549 Mon Sep 17 00:00:00 2001 From: Kevin Schaaf Date: Wed, 11 Jul 2018 12:18:12 -0700 Subject: [PATCH] Extend Edge exceptions beyond Edge 16 --- test/unit/custom-style.html | 4 ++-- test/unit/styling-cross-scope-apply.html | 2 +- test/unit/styling-scoped.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unit/custom-style.html b/test/unit/custom-style.html index 97ff8ac21a..983fa8d8e2 100644 --- a/test/unit/custom-style.html +++ b/test/unit/custom-style.html @@ -483,8 +483,8 @@ 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)) { + // Avoid Edge bug with CSS Custom Properties and Fonts. + if (navigator.userAgent.match('Edge') && (!window.ShadyCSS || window.ShadyCSS.nativeCss)) { return; } diff --git a/test/unit/styling-cross-scope-apply.html b/test/unit/styling-cross-scope-apply.html index 8cd5d27906..e36ebd2457 100644 --- a/test/unit/styling-cross-scope-apply.html +++ b/test/unit/styling-cross-scope-apply.html @@ -588,7 +588,7 @@ }); test('mixins apply to @keyframe rules', function(done) { - if (navigator.userAgent.match('Edge/16') && (!window.ShadyCSS || window.ShadyCSS.nativeCss)) { + if (navigator.userAgent.match('Edge') && (!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(); diff --git a/test/unit/styling-scoped.html b/test/unit/styling-scoped.html index 47b63d85e7..e5dcddb64f 100644 --- a/test/unit/styling-scoped.html +++ b/test/unit/styling-scoped.html @@ -890,7 +890,7 @@ }); test('keyframes change scope', function(done) { - if (navigator.userAgent.match('Edge/16') && (!window.ShadyCSS || window.ShadyCSS.nativeCss)) { + if (navigator.userAgent.match('Edge') && (!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();