Merge pull request #136 from angular/master

Update upstream

Author: GulajavaMinistudio

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);

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) {