Backed out changeset e72421387bb8 (bug 1153457) for eslint failure in browser_RemoteWebNavigation.js
authorIris Hsiao <ihsiao@mozilla.com>
Wed, 01 Mar 2017 10:50:17 +0800
changeset 394186 13758ac39b56f55194fe7bee6befc9bfa8d10a2e
parent 394185 67617bd5c3e8cf3d44b5afdfa24257c2d2a131fe
child 394187 eb4e310f304053f436b08ce6fdd0add014b7e1f6
push id1468
push userasasaki@mozilla.com
push dateMon, 05 Jun 2017 19:31:07 +0000
treeherdermozilla-release@0641fc6ee9d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1153457
milestone54.0a1
backs oute72421387bb835f7959217fe680dcb3925fee381
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset e72421387bb8 (bug 1153457) for eslint failure in browser_RemoteWebNavigation.js
toolkit/components/remotebrowserutils/tests/browser/browser_RemoteWebNavigation.js
--- a/toolkit/components/remotebrowserutils/tests/browser/browser_RemoteWebNavigation.js
+++ b/toolkit/components/remotebrowserutils/tests/browser/browser_RemoteWebNavigation.js
@@ -1,19 +1,27 @@
 var { interfaces: Ci, classes: Cc, utils: Cu, results: Cr } = Components;
 
 const DUMMY1 = "http://example.com/browser/toolkit/modules/tests/browser/dummy_page.html";
 const DUMMY2 = "http://example.org/browser/toolkit/modules/tests/browser/dummy_page.html"
 
 function waitForLoad(browser = gBrowser.selectedBrowser) {
-  return BrowserTestUtils.browserLoaded(browser);
+  return new Promise(resolve => {
+    browser.addEventListener("load", function() {
+      resolve();
+    }, {capture: true, once: true});
+  });
 }
 
 function waitForPageShow(browser = gBrowser.selectedBrowser) {
-  return BrowserTestUtils.waitForContentEvent(browser, "pageshow", true);
+  return new Promise(resolve => {
+    browser.addEventListener("pageshow", function() {
+      resolve();
+    }, {capture: true, once: true});
+  });
 }
 
 function makeURI(url) {
   return Cc["@mozilla.org/network/io-service;1"].
          getService(Ci.nsIIOService).
          newURI(url);
 }
 
@@ -22,109 +30,93 @@ add_task(function* test_referrer() {
   gBrowser.selectedTab = gBrowser.addTab();
   let browser = gBrowser.selectedBrowser;
 
   browser.webNavigation.loadURI(DUMMY1,
                                 Ci.nsIWebNavigation.LOAD_FLAGS_NONE,
                                 makeURI(DUMMY2),
                                 null, null);
   yield waitForLoad();
-
-  yield ContentTask.spawn(browser, [ DUMMY1, DUMMY2 ], function([dummy1, dummy2]) {
-    is(content.location, dummy1, "Should have loaded the right URL");
-    is(content.document.referrer, dummy2, "Should have the right referrer");
-  });
+  is(browser.contentWindow.location, DUMMY1, "Should have loaded the right URL");
+  is(browser.contentDocument.referrer, DUMMY2, "Should have the right referrer");
 
   gBrowser.removeCurrentTab();
 });
 
 // Tests that remote access to webnavigation.sessionHistory works.
 add_task(function* test_history() {
-  function checkHistoryIndex(browser, n) {
-    return ContentTask.spawn(browser, n, function(n) {
-      let history = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
-                            .getInterface(Ci.nsISHistory);
-      is(history.index, n, "Should be at the right place in history");
-    });
-  }
   gBrowser.selectedTab = gBrowser.addTab();
   let browser = gBrowser.selectedBrowser;
 
   browser.webNavigation.loadURI(DUMMY1,
                                 Ci.nsIWebNavigation.LOAD_FLAGS_NONE,
                                 null, null, null);
   yield waitForLoad();
 
   browser.webNavigation.loadURI(DUMMY2,
                                 Ci.nsIWebNavigation.LOAD_FLAGS_NONE,
                                 null, null, null);
   yield waitForLoad();
 
-  yield ContentTask.spawn(browser, [DUMMY1, DUMMY2], function([dummy1, dummy2]) {
-    let history = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
-                          .getInterface(Ci.nsISHistory);
-    is(history.count, 2, "Should be two history items");
-    is(history.index, 1, "Should be at the right place in history");
-    let entry = history.getEntryAtIndex(0, false);
-    is(entry.URI.spec, dummy1, "Should have the right history entry");
-    entry = history.getEntryAtIndex(1, false);
-    is(entry.URI.spec, dummy2, "Should have the right history entry");
-  });
+  let history = browser.webNavigation.sessionHistory;
+  is(history.count, 2, "Should be two history items");
+  is(history.index, 1, "Should be at the right place in history");
+  let entry = history.getEntryAtIndex(0, false);
+  is(entry.URI.spec, DUMMY1, "Should have the right history entry");
+  entry = history.getEntryAtIndex(1, false);
+  is(entry.URI.spec, DUMMY2, "Should have the right history entry");
 
   let promise = waitForPageShow();
   browser.webNavigation.goBack();
   yield promise;
-  yield checkHistoryIndex(browser, 0);
+  is(history.index, 0, "Should be at the right place in history");
 
   promise = waitForPageShow();
   browser.webNavigation.goForward();
   yield promise;
-  yield checkHistoryIndex(browser, 1);
+  is(history.index, 1, "Should be at the right place in history");
 
   promise = waitForPageShow();
   browser.webNavigation.gotoIndex(0);
   yield promise;
-  yield checkHistoryIndex(browser, 0);
+  is(history.index, 0, "Should be at the right place in history");
 
   gBrowser.removeCurrentTab();
 });
 
 // Tests that load flags are passed through to the content process.
 add_task(function* test_flags() {
-  function checkHistory(browser, { count, index }) {
-    return ContentTask.spawn(browser, [ DUMMY2, count, index ],
-      function([ dummy2, count, index ]) {
-        let history = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
-                              .getInterface(Ci.nsISHistory);
-        is(history.count, count, "Should be one history item");
-        is(history.index, index, "Should be at the right place in history");
-        let entry = history.getEntryAtIndex(index, false);
-        is(entry.URI.spec, dummy2, "Should have the right history entry");
-      });
-  }
-
   gBrowser.selectedTab = gBrowser.addTab();
   let browser = gBrowser.selectedBrowser;
 
   browser.webNavigation.loadURI(DUMMY1,
                                 Ci.nsIWebNavigation.LOAD_FLAGS_NONE,
                                 null, null, null);
   yield waitForLoad();
 
   browser.webNavigation.loadURI(DUMMY2,
                                 Ci.nsIWebNavigation.LOAD_FLAGS_REPLACE_HISTORY,
                                 null, null, null);
   yield waitForLoad();
-  yield checkHistory(browser, { count: 1, index: 0 });
+
+  let history = browser.webNavigation.sessionHistory;
+  is(history.count, 1, "Should be one history item");
+  is(history.index, 0, "Should be at the right place in history");
+  let entry = history.getEntryAtIndex(0, false);
+  is(entry.URI.spec, DUMMY2, "Should have the right history entry");
 
   browser.webNavigation.loadURI(DUMMY1,
                                 Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_HISTORY,
                                 null, null, null);
   yield waitForLoad();
-  yield checkHistory(browser, { count: 1, index: 0 });
+
+  is(history.count, 1, "Should still be one history item");
+  is(history.index, 0, "Should be at the right place in history");
+  entry = history.getEntryAtIndex(0, false);
+  is(entry.URI.spec, DUMMY2, "Should have the right history entry");
 
   gBrowser.removeCurrentTab();
 });
 
 // Tests that attempts to use unsupported arguments throw an exception.
 add_task(function* test_badarguments() {
   if (!gMultiProcessBrowser)
     return;