Bug 1261842 - Make browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js wait for windows to be ready before sending them places. r?Gijs draft
authorMike Conley <mconley@mozilla.com>
Wed, 08 Jun 2016 11:56:54 -0400
changeset 392019 c13edf06c5842d7c02ef22892e4e89c0b921eb98
parent 392018 5d41682cd6b3e031f2bae19ec8c3c24d6dbcc861
child 392020 756d1a613d7051b5a77c112e11e1a07a6917f2a2
push id23919
push usermconley@mozilla.com
push dateFri, 22 Jul 2016 20:54:03 +0000
reviewersGijs
bugs1261842
milestone50.0a1
Bug 1261842 - Make browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js wait for windows to be ready before sending them places. r?Gijs MozReview-Commit-ID: 3sunq7zrr0e
browser/base/content/test/general/browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js
--- 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);