Skip to content

Commit eff8b88

Browse files
committed
Fixing eager page load strategy in Firefox
1 parent d987aed commit eff8b88

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public void testNoneStrategyShouldNotWaitForPageToRefresh() {
119119
assertTrue("Took too long to load page: " + duration, duration < 1000);
120120
}
121121

122-
@Ignore(value = {FIREFOX, IE, CHROME, SAFARI, MARIONETTE, PHANTOMJS, HTMLUNIT})
122+
@Ignore(value = {IE, CHROME, SAFARI, MARIONETTE, PHANTOMJS, HTMLUNIT})
123123
@NeedsLocalEnvironment
124124
@Test
125125
public void testEagerStrategyShouldNotWaitForResources() {

javascript/firefox-driver/js/webLoadingListener.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ ImpatientListener.prototype.onProgressChange = function(webProgress) {
172172
if (bot.userAgent.isProductVersion('4')) {
173173
WebLoadingListener.removeListener(this.browser, this);
174174
}
175-
this.onComplete();
175+
this.onComplete(false, true);
176176
}
177177

178178
return 0;
@@ -225,9 +225,9 @@ WebLoadingListener = function(browser, toCall, timeout, opt_window) {
225225
}
226226

227227
loadingListenerTimer = new fxdriver.Timer();
228-
var func = function(timedOut) {
228+
var func = function(timedOut, opt_stopWaiting) {
229229
loadingListenerTimer.cancel();
230-
toCall(timedOut);
230+
toCall(timedOut, opt_stopWaiting);
231231
};
232232

233233
/** @type {!nsIWebProgressListener} */

0 commit comments

Comments
 (0)