fix(client): clearContext after complete sent (#3657)

When useiframe false and clearContext true and IE11, the clearContext blocks the complete event.
karma-runner · Mar 24, 2021 · c0962e3 · c0962e3
1 parent 3eb7ee7
commit c0962e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/client/karma.js b/client/karma.js
@@ -236,13 +236,12 @@ function Karma (updater, socket, iframe, opener, navigator, location, document)
     // to ensure the error from an incorrect navigate is processed.
     var config = this.config
     setTimeout(function () {
+      socket.emit('complete', result || {})
       if (config.clearContext) {
         navigateContextTo('about:blank')
+      } else {
+        self.updater.updateTestStatus('complete')
       }
-
-      socket.emit('complete', result || {})
-      self.updater.updateTestStatus('complete')
-
       if (returnUrl) {
         location.href = returnUrl
       }

diff --git a/static/karma.js b/static/karma.js
@@ -246,13 +246,12 @@ function Karma (updater, socket, iframe, opener, navigator, location, document)
     // to ensure the error from an incorrect navigate is processed.
     var config = this.config
     setTimeout(function () {
+      socket.emit('complete', result || {})
       if (config.clearContext) {
         navigateContextTo('about:blank')
+      } else {
+        self.updater.updateTestStatus('complete')
       }
-
-      socket.emit('complete', result || {})
-      self.updater.updateTestStatus('complete')
-
       if (returnUrl) {
         location.href = returnUrl
       }