Fixing eager page loading strategy on refresh

Author: barancev

java/client/test/org/openqa/selenium/PageLoadingTest.java

@@ -95,6 +95,30 @@ public void testShouldNotWaitForResourcesWithEagerStrategy() {
     assertTrue("Took too long to load page: " + duration, duration < 5 * 1000);
   }
 
+  @Ignore(value = {CHROME, IE, OPERA, SAFARI, MARIONETTE, PHANTOMJS, HTMLUNIT})
+  @NeedsLocalEnvironment
+  @Test
+  public void testShouldNotWaitForResourcesOnRefreshWithEagerStrategy() {
+    initLocalDriver("unstable");
+
+    String slowPage = appServer.whereIs("slowLoadingResourcePage.html");
+
+    localDriver.get(slowPage);
+    // We discard the element, but want a check to make sure the GET actually completed.
+    localDriver.findElement(By.id("peas"));
+
+    long start = System.currentTimeMillis();
+    localDriver.navigate().refresh();
+    // We discard the element, but want a check to make sure the refresh actually completed.
+    localDriver.findElement(By.id("peas"));
+    long end = System.currentTimeMillis();
+    // The slow loading resource on that page takes 6 seconds to return. If we
+    // waited for it, our load time should be over 6 seconds.
+    long duration = end - start;
+
+    assertTrue("Took too long to refresh page: " + duration, duration < 5 * 1000);
+  }
+
   @Test
   public void testShouldWaitForDocumentToBeLoaded() {
     driver.get(pages.simpleTestPage);

javascript/firefox-driver/js/firefoxDriver.js

@@ -672,7 +672,7 @@ FirefoxDriver.prototype.refresh = function(respond) {
   var browser = respond.session.getBrowser();
   browser.contentWindow.location.reload(true);
   // Wait for the reload to finish before sending the response.
-  new WebLoadingListener(respond.session.getBrowser(), function(timedOut) {
+  new WebLoadingListener(browser, function(timedOut) {
     // Reset to the top window.
     respond.session.setWindow(browser.contentWindow);
     if (timedOut) {
@@ -681,7 +681,7 @@ FirefoxDriver.prototype.refresh = function(respond) {
     } else {
       respond.send();
     }
-  }, respond.session.getPageLoadTimeout());
+  }, respond.session.getPageLoadTimeout(), browser.contentWindow);
 };