diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini index 4db0d3ad1891..bce24a7fae89 100644 --- a/browser/base/content/test/general/browser.ini +++ b/browser/base/content/test/general/browser.ini @@ -238,7 +238,7 @@ skip-if = e10s && debug [browser_bug624734.js] [browser_bug633691.js] [browser_bug647886.js] -skip-if = buildapp == 'mulet' || e10s # Bug 1093373 - Relies on browser.sessionHistory +skip-if = buildapp == 'mulet' [browser_bug655584.js] [browser_bug664672.js] [browser_bug676619.js] diff --git a/browser/base/content/test/general/browser_bug647886.js b/browser/base/content/test/general/browser_bug647886.js index 4a41fc6ada1c..6b5bbef49446 100644 --- a/browser/base/content/test/general/browser_bug647886.js +++ b/browser/base/content/test/general/browser_bug647886.js @@ -1,36 +1,25 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -function test() { - waitForExplicitFinish(); - - gBrowser.selectedTab = gBrowser.addTab(); - gBrowser.selectedBrowser.addEventListener("load", function () { - gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true); +add_task(function* () { + yield BrowserTestUtils.openNewForegroundTab(gBrowser, "http://example.com"); + yield ContentTask.spawn(gBrowser.selectedBrowser, {}, function* () { content.history.pushState({}, "2", "2.html"); + }); - testBackButton(); - }, true); - - loadURI("http://example.com"); -} - -function testBackButton() { var backButton = document.getElementById("back-button"); var rect = backButton.getBoundingClientRect(); info("waiting for the history menu to open"); - backButton.addEventListener("popupshown", function (event) { - backButton.removeEventListener("popupshown", arguments.callee, false); - - ok(true, "history menu opened"); - event.target.hidePopup(); - gBrowser.removeTab(gBrowser.selectedTab); - finish(); - }, false); - + let popupShownPromise = BrowserTestUtils.waitForEvent(backButton, "popupshown"); EventUtils.synthesizeMouseAtCenter(backButton, {type: "mousedown"}); EventUtils.synthesizeMouse(backButton, rect.width / 2, rect.height, {type: "mouseup"}); -} + let event = yield popupShownPromise; + + ok(true, "history menu opened"); + + event.target.hidePopup(); + gBrowser.removeTab(gBrowser.selectedTab); +});