зеркало из https://github.com/mozilla/gecko-dev.git
Bug 925225 - Fixing intermittent failure in test browser_bug676619.js, r=qdot
This commit is contained in:
Andrea Marchesini
Родитель
cc862266e9
Коммит
a924e3c5af
|
|
@ -253,7 +253,6 @@ skip-if = toolkit != "cocoa" # Because of tests for supporting pasting from Serv
|
|||
[browser_bug664672.js]
|
||||
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
|
||||
[browser_bug676619.js]
|
||||
skip-if = os == "mac" # mac: Intermittent failures, bug 925225
|
||||
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
|
||||
[browser_bug678392.js]
|
||||
skip-if = os == "mac" # Bug 1102331 - does focus things on the content window which break in e10s mode (still causes orange on Mac 10.10)
|
||||
|
|
|
|||
|
|
@ -1,124 +1,83 @@
|
|||
function test() {
|
||||
function waitForNewWindow() {
|
||||
return new Promise(resolve => {
|
||||
var listener = {
|
||||
onOpenWindow: aXULWindow => {
|
||||
info("Download window shown...");
|
||||
Services.wm.removeListener(listener);
|
||||
|
||||
function downloadOnLoad() {
|
||||
domwindow.removeEventListener("load", downloadOnLoad, true);
|
||||
|
||||
is(domwindow.document.location.href, "chrome://mozapps/content/downloads/unknownContentType.xul", "Download page appeared");
|
||||
resolve(domwindow);
|
||||
}
|
||||
|
||||
var domwindow = aXULWindow.QueryInterface(Ci.nsIInterfaceRequestor)
|
||||
.getInterface(Ci.nsIDOMWindow);
|
||||
domwindow.addEventListener("load", downloadOnLoad, true);
|
||||
},
|
||||
onCloseWindow: aXULWindow => {},
|
||||
onWindowTitleChange: (aXULWindow, aNewTitle) => {}
|
||||
}
|
||||
|
||||
Services.wm.addListener(listener);
|
||||
});
|
||||
}
|
||||
|
||||
async function testLink(link, name) {
|
||||
info("Checking " + link + " with name: " + name);
|
||||
|
||||
let winPromise = waitForNewWindow();
|
||||
|
||||
ContentTask.spawn(gBrowser.selectedBrowser, link, contentLink => {
|
||||
content.document.getElementById(contentLink).click();
|
||||
});
|
||||
|
||||
let win = await winPromise;
|
||||
|
||||
await ContentTask.spawn(gBrowser.selectedBrowser, null, () => {
|
||||
Assert.equal(content.document.getElementById("unload-flag").textContent,
|
||||
"Okay", "beforeunload shouldn't have fired");
|
||||
});
|
||||
|
||||
is(win.document.getElementById("location").value, name, "file name should match");
|
||||
|
||||
await BrowserTestUtils.closeWindow(win);
|
||||
}
|
||||
|
||||
async function testLocation(link, url) {
|
||||
let tabPromise = BrowserTestUtils.waitForNewTab(gBrowser);
|
||||
|
||||
ContentTask.spawn(gBrowser.selectedBrowser, link, contentLink => {
|
||||
content.document.getElementById(contentLink).click();
|
||||
});
|
||||
|
||||
let tab = await tabPromise;
|
||||
await BrowserTestUtils.removeTab(tab);
|
||||
}
|
||||
|
||||
async function runTest(url) {
|
||||
let tab = BrowserTestUtils.addTab(gBrowser, url);
|
||||
gBrowser.selectedTab = tab;
|
||||
|
||||
let browser = gBrowser.getBrowserForTab(tab);
|
||||
await BrowserTestUtils.browserLoaded(browser);
|
||||
|
||||
await testLink("link1", "test.txt");
|
||||
await testLink("link2", "video.ogg");
|
||||
await testLink("link3", "just some video");
|
||||
await testLink("link4", "with-target.txt");
|
||||
await testLink("link5", "javascript.txt");
|
||||
await testLink("link6", "test.blob");
|
||||
await testLocation("link7", "http://example.com/");
|
||||
|
||||
await BrowserTestUtils.removeTab(tab);
|
||||
}
|
||||
|
||||
add_task(async function() {
|
||||
requestLongerTimeout(3);
|
||||
waitForExplicitFinish();
|
||||
|
||||
var isHTTPS = false;
|
||||
|
||||
function loadListener() {
|
||||
function testLocation(link, url, next) {
|
||||
new TabOpenListener(url, function() {
|
||||
gBrowser.removeTab(this.tab);
|
||||
}, function() {
|
||||
next();
|
||||
});
|
||||
|
||||
ContentTask.spawn(gBrowser.selectedBrowser, link, contentLink => {
|
||||
content.document.getElementById(contentLink).click();
|
||||
});
|
||||
}
|
||||
|
||||
function testLink(link, name, next) {
|
||||
addWindowListener("chrome://mozapps/content/downloads/unknownContentType.xul", function(win) {
|
||||
ContentTask.spawn(gBrowser.selectedBrowser, null, () => {
|
||||
Assert.equal(content.document.getElementById("unload-flag").textContent,
|
||||
"Okay", "beforeunload shouldn't have fired");
|
||||
}).then(() => {
|
||||
is(win.document.getElementById("location").value, name, "file name should match");
|
||||
win.close();
|
||||
next();
|
||||
});
|
||||
});
|
||||
|
||||
ContentTask.spawn(gBrowser.selectedBrowser, link, contentLink => {
|
||||
content.document.getElementById(contentLink).click();
|
||||
});
|
||||
}
|
||||
|
||||
testLink("link1", "test.txt",
|
||||
testLink.bind(null, "link2", "video.ogg",
|
||||
testLink.bind(null, "link3", "just some video",
|
||||
testLink.bind(null, "link4", "with-target.txt",
|
||||
testLink.bind(null, "link5", "javascript.txt",
|
||||
testLink.bind(null, "link6", "test.blob",
|
||||
testLocation.bind(null, "link7", "http://example.com/",
|
||||
function() {
|
||||
if (isHTTPS) {
|
||||
finish();
|
||||
} else {
|
||||
// same test again with https:
|
||||
isHTTPS = true;
|
||||
gBrowser.loadURI("https://example.com:443/browser/browser/base/content/test/general/download_page.html");
|
||||
}
|
||||
})))))));
|
||||
|
||||
}
|
||||
|
||||
BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser).then(() => {
|
||||
loadListener();
|
||||
BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser).then(loadListener);
|
||||
});
|
||||
|
||||
gBrowser.loadURI("http://mochi.test:8888/browser/browser/base/content/test/general/download_page.html");
|
||||
}
|
||||
|
||||
|
||||
function addWindowListener(aURL, aCallback) {
|
||||
Services.wm.addListener({
|
||||
onOpenWindow(aXULWindow) {
|
||||
info("window opened, waiting for focus");
|
||||
Services.wm.removeListener(this);
|
||||
|
||||
var domwindow = aXULWindow.QueryInterface(Ci.nsIInterfaceRequestor)
|
||||
.getInterface(Ci.nsIDOMWindow);
|
||||
waitForFocus(function() {
|
||||
is(domwindow.document.location.href, aURL, "should have seen the right window open");
|
||||
aCallback(domwindow);
|
||||
}, domwindow);
|
||||
},
|
||||
onCloseWindow(aXULWindow) { },
|
||||
onWindowTitleChange(aXULWindow, aNewTitle) { }
|
||||
});
|
||||
}
|
||||
|
||||
// This listens for the next opened tab and checks it is of the right url.
|
||||
// opencallback is called when the new tab is fully loaded
|
||||
// closecallback is called when the tab is closed
|
||||
function TabOpenListener(url, opencallback, closecallback) {
|
||||
this.url = url;
|
||||
this.opencallback = opencallback;
|
||||
this.closecallback = closecallback;
|
||||
|
||||
gBrowser.tabContainer.addEventListener("TabOpen", this);
|
||||
}
|
||||
|
||||
TabOpenListener.prototype = {
|
||||
url: null,
|
||||
opencallback: null,
|
||||
closecallback: null,
|
||||
tab: null,
|
||||
browser: null,
|
||||
|
||||
handleEvent(event) {
|
||||
if (event.type == "TabOpen") {
|
||||
gBrowser.tabContainer.removeEventListener("TabOpen", this);
|
||||
this.tab = event.originalTarget;
|
||||
this.browser = this.tab.linkedBrowser;
|
||||
BrowserTestUtils.browserLoaded(this.browser, false, this.url).then(() => {
|
||||
this.tab.addEventListener("TabClose", this);
|
||||
var url = this.browser.currentURI.spec;
|
||||
is(url, this.url, "Should have opened the correct tab");
|
||||
this.opencallback();
|
||||
});
|
||||
} else if (event.type == "TabClose") {
|
||||
if (event.originalTarget != this.tab)
|
||||
return;
|
||||
this.tab.removeEventListener("TabClose", this);
|
||||
this.opencallback = null;
|
||||
this.tab = null;
|
||||
this.browser = null;
|
||||
// Let the window close complete
|
||||
executeSoon(this.closecallback);
|
||||
this.closecallback = null;
|
||||
}
|
||||
}
|
||||
};
|
||||
await runTest("http://mochi.test:8888/browser/browser/base/content/test/general/download_page.html");
|
||||
await runTest("https://example.com:443/browser/browser/base/content/test/general/download_page.html");
|
||||
});
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче