From 3cf4eed6b58c4b09a44d59cba68f3d6a7283a2a4 Mon Sep 17 00:00:00 2001 From: Martin Staffa Date: Sun, 6 May 2018 19:34:53 +0200 Subject: [PATCH 1/2] test($sanitize): exclude elclob test in Edge 17 (#16555) We don't exclude Edge completely to know if the bug has been fixed in the next version --- test/ngSanitize/sanitizeSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ngSanitize/sanitizeSpec.js b/test/ngSanitize/sanitizeSpec.js index a047be989642..5e8a020c5870 100644 --- a/test/ngSanitize/sanitizeSpec.js +++ b/test/ngSanitize/sanitizeSpec.js @@ -261,7 +261,7 @@ describe('HTML', function() { }); }); - if (!/Edge\/16/.test(window.navigator.userAgent)) { + if (!/Edge\/(16|17)/.test(window.navigator.userAgent)) { // Skip test on Edge 16 due to browser bug. it('should throw on a form with an input named "nextSibling"', function() { inject(function($sanitize) { From 70b801f3269738290e8edb2cd1326da7920d11f9 Mon Sep 17 00:00:00 2001 From: Martin Staffa Date: Mon, 7 May 2018 18:10:16 +0200 Subject: [PATCH 2/2] test(Angular): remove special case for Edge Edge 17 supports this behavior. Closes #16558 --- test/AngularSpec.js | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/test/AngularSpec.js b/test/AngularSpec.js index f607e95e3fe1..6cf88b0b0e5d 100644 --- a/test/AngularSpec.js +++ b/test/AngularSpec.js @@ -1785,21 +1785,9 @@ describe('angular', function() { protocol = 'browserext:'; // Upcoming standard scheme. } - - if (protocol === 'ms-browser-extension:') { - // Support: Edge 13-15 - // In Edge, URLs with protocol 'ms-browser-extension:' return "null" for the origin, - // therefore it's impossible to know if a script is same-origin. - it('should not bootstrap for same-origin documents', function() { - expect(allowAutoBootstrap(createFakeDoc({src: protocol + '//something'}, protocol))).toBe(false); - }); - - } else { - it('should bootstrap for same-origin documents', function() { - - expect(allowAutoBootstrap(createFakeDoc({src: protocol + '//something'}, protocol))).toBe(true); - }); - } + it('should bootstrap for same-origin documents', function() { + expect(allowAutoBootstrap(createFakeDoc({src: protocol + '//something'}, protocol))).toBe(true); + }); it('should not bootstrap for cross-origin documents', function() { expect(allowAutoBootstrap(createFakeDoc({src: protocol + '//something-else'}, protocol))).toBe(false);