From feee36c8c9e17d47e044c085012128108ce36b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Go=C5=82=C4=99biowski-Owczarek?=
 <m.goleb@gmail.com>
Date: Wed, 28 Mar 2018 13:20:42 +0200
Subject: [PATCH 1/2] tests(ngMock): remove a broken jqLite cache clearing
 (#16515)

This commit removes the resetting of `angular.element.cache` in some tests;
this was desynchronizing jqLite.cache & the local jqCache variable and since
some parts of the code use one of them and some the other one, it was breaking
JQLite._data. `angular.element.cache` doesn't even exist when jQuery 2+ is used.

Closes #16515
Refs #16512
---
 test/ngMock/angular-mocksSpec.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js
index 43c39772a9ea..9bfbcfc741a4 100644
--- a/test/ngMock/angular-mocksSpec.js
+++ b/test/ngMock/angular-mocksSpec.js
@@ -3123,10 +3123,6 @@ describe('sharedInjector', function() {
         define();
         sdescribe.root.run();
       } finally {
-        // avoid failing testability for the additional
-        // injectors etc created
-        angular.element.cache = {};
-
         // clear up
         module.$$beforeAllHook = null;
         module.$$afterAllHook = null;

From b0815a702ef6cfee4e106d7b7bdbfd50240815e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Go=C5=82=C4=99biowski-Owczarek?=
 <m.goleb@gmail.com>
Date: Wed, 28 Mar 2018 14:43:45 +0200
Subject: [PATCH 2/2] chore(*): stop testing on Edge 15 due to its instability

Edge 15 disconnects from Karma frequently causing extreme build instability.
We are testing on Edge 16 & Edge 17 should be released soon anyway.

Closes #16516
---
 scripts/travis/build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh
index 39c62de0de65..b1ee4bb284fe 100755
--- a/scripts/travis/build.sh
+++ b/scripts/travis/build.sh
@@ -11,12 +11,14 @@ export SAUCE_ACCESS_KEY
 BROWSER_STACK_ACCESS_KEY=$(echo "$BROWSER_STACK_ACCESS_KEY" | rev)
 SAUCE_ACCESS_KEY=$(echo "$SAUCE_ACCESS_KEY" | rev)
 
+# TODO: restore "SL_EDGE-1" once Sauce Labs adds Edge 17 and "SL_EDGE-1" refers
+# to version 16. Edge 15 disconnects from Karma frequently causing extreme build instability.
 BROWSERS="SL_Chrome,SL_Chrome-1,\
 SL_Firefox,SL_Firefox-1,\
 SL_Safari,SL_Safari-1,\
 SL_iOS_10,SL_iOS_11,\
 SL_IE_9,SL_IE_10,SL_IE_11,\
-SL_EDGE,SL_EDGE-1"
+SL_EDGE"
 
 case "$JOB" in
   "ci-checks")