Bug 1261842 - Make browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js wait for windows to be ready before sending them places. r?Gijs
MozReview-Commit-ID: 3sunq7zrr0e
--- a/browser/base/content/test/general/browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js
+++ b/browser/base/content/test/general/browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js
@@ -33,23 +33,23 @@ registerCleanupFunction(() => {
Services.prefs.clearUserPref(OPEN_LOCATION_PREF);
});
/**
* Test that if we open a new tab from a link in a non-remote
* browser in an e10s window, that the new tab will load properly.
*/
add_task(function* test_new_tab() {
- let normalWindow = yield promiseOpenAndLoadWindow({
- remote: true
- }, true);
- let privateWindow = yield promiseOpenAndLoadWindow({
+ let normalWindow = yield BrowserTestUtils.openNewBrowserWindow({
+ remote: true,
+ });
+ let privateWindow = yield BrowserTestUtils.openNewBrowserWindow({
remote: true,
private: true,
- }, true);
+ });
for (let testWindow of [normalWindow, privateWindow]) {
yield promiseWaitForFocus(testWindow);
let testBrowser = testWindow.gBrowser.selectedBrowser;
info("Preparing non-remote browser");
yield prepareNonRemoteBrowser(testWindow, testBrowser);
info("Non-remote browser prepared - sending frame script");
@@ -75,20 +75,20 @@ add_task(function* test_new_tab() {
});
/**
* Test that if we open a new window from a link in a non-remote
* browser in an e10s window, that the new window is not an e10s
* window. Also tests with a private browsing window.
*/
add_task(function* test_new_window() {
- let normalWindow = yield promiseOpenAndLoadWindow({
+ let normalWindow = yield BrowserTestUtils.openNewBrowserWindow({
remote: true
}, true);
- let privateWindow = yield promiseOpenAndLoadWindow({
+ let privateWindow = yield BrowserTestUtils.openNewBrowserWindow({
remote: true,
private: true,
}, true);
// Fiddle with the prefs so that we open target="_blank" links
// in new windows instead of new tabs.
Services.prefs.setIntPref(OPEN_LOCATION_PREF,
Ci.nsIBrowserDOMWindow.OPEN_NEWWINDOW);