Merge 6924539 into ead31cd

client/karma.js

@@ -4,7 +4,7 @@ var util = require('../common/util')
 
 function Karma (socket, iframe, opener, navigator, location, document) {
   var startEmitted = false
-  var reloadingContext = false
+  var karmaNavigating = false
   var self = this
   var queryParams = util.parseQueryParams(location.search)
   var browserId = queryParams.id || util.generateId('manual-')
@@ -80,6 +80,7 @@ function Karma (socket, iframe, opener, navigator, location, document) {
 
   var childWindow = null
   function navigateContextTo (url) {
+    karmaNavigating = true
     if (self.config.useIframe === false) {
       // run in new window
       if (self.config.runInParent === false) {
@@ -127,16 +128,14 @@ function Karma (socket, iframe, opener, navigator, location, document) {
   }
 
   this.onbeforeunload = function () {
-    if (!reloadingContext) {
+    if (!karmaNavigating) {
       // TODO(vojta): show what test (with explanation about jasmine.UPDATE_INTERVAL)
       self.error('Some of your tests did a full page reload!')
     }
-    reloadingContext = false
+    karmaNavigating = false
   }
 
   function clearContext () {
-    reloadingContext = true
-
     navigateContextTo('about:blank')
   }