bug 1347677 - Use BrowserTestUtils.waitForErrorPage in browser_bug431826.js. r=johannh
authorDan Banner <dbugs@thebanners.uk>
Thu, 13 Apr 2017 13:58:00 +0100
changeset 353057 f709675d6a7995634356b65e1f46ccea56345e9e
parent 353056 5fccdd8de0ae9d2ef16d09f8117992f18ccaffa7
child 353058 0ac4960227da322feca7798925e11286c9cce5dd
push id31656
push userihsiao@mozilla.com
push dateFri, 14 Apr 2017 09:10:41 +0000
treeherdermozilla-central@cda24082bff8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjohannh
bugs1347677, 431826
milestone55.0a1
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
bug 1347677 - Use BrowserTestUtils.waitForErrorPage in browser_bug431826.js. r=johannh MozReview-Commit-ID: AnDGq52UfPM
browser/base/content/test/general/browser_bug431826.js
--- a/browser/base/content/test/general/browser_bug431826.js
+++ b/browser/base/content/test/general/browser_bug431826.js
@@ -1,20 +1,16 @@
 function remote(task) {
   return ContentTask.spawn(gBrowser.selectedBrowser, null, task);
 }
 
 add_task(function* () {
   gBrowser.selectedTab = gBrowser.addTab();
 
-  let promise = remote(function() {
-    return ContentTaskUtils.waitForEvent(this, "DOMContentLoaded", true, event => {
-      return content.document.documentURI != "about:blank";
-    }).then(() => 0); // don't want to send the event to the chrome process
-  });
+  let promise = BrowserTestUtils.waitForErrorPage(gBrowser.selectedBrowser);
   gBrowser.loadURI("https://nocert.example.com/");
   yield promise;
 
   yield remote(() => {
     // Confirm that we are displaying the contributed error page, not the default
     let uri = content.document.documentURI;
     Assert.ok(uri.startsWith("about:certerror"), "Broken page should go to about:certerror, not about:neterror");
   });
@@ -25,19 +21,17 @@ add_task(function* () {
     Assert.ok(div, "Advanced content div should exist");
     Assert.equal(div.ownerGlobal.getComputedStyle(div).display,
       "none", "Advanced content should not be visible by default");
   });
 
   // Tweak the expert mode pref
   gPrefService.setBoolPref("browser.xul.error_pages.expert_bad_cert", true);
 
-  promise = remote(function() {
-    return ContentTaskUtils.waitForEvent(this, "DOMContentLoaded", true);
-  });
+  promise = BrowserTestUtils.waitForErrorPage(gBrowser.selectedBrowser);
   gBrowser.reload();
   yield promise;
 
   yield remote(() => {
     let div = content.document.getElementById("badCertAdvancedPanel");
     Assert.ok(div, "Advanced content div should exist");
     Assert.equal(div.ownerGlobal.getComputedStyle(div).display,
       "block", "Advanced content should be visible by default");