Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1093404, rewrite test to account for asynchronous tab opening, r=gijs

Browse Source
This commit is contained in:
Neil Deakin 2015-03-16 08:23:49 -04:00
parent e939a4d7a8
commit 0da80cf294
2 changed files with 30 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/base/content/test/general/browser.ini
View File

@ -182,7 +182,6 @@ skip-if = e10s # Bug 866413 - PageInfo doesn't work in e10s
[browser_bug462289.js]
skip-if = toolkit == "cocoa" || e10s # Bug 1102017 - middle-button mousedown on selected tab2 does not activate tab - Didn't expect [object XULElement], but got it
[browser_bug462673.js]
skip-if = e10s # Bug 1093404 - test expects sync window opening from content and is disappointed in that expectation
[browser_bug477014.js]
[browser_bug479408.js]
skip-if = buildapp == 'mulet'

85
browser/base/content/test/general/browser_bug462673.js
View File

@ -1,61 +1,36 @@
var runs = [
function (win, tabbrowser, tab) {
is(tabbrowser.browsers.length, 2, "test_bug462673.html has opened a second tab");
is(tabbrowser.selectedTab, tab.nextSibling, "dependent tab is selected");
tabbrowser.removeTab(tab);
// Closing a tab will also close its parent chrome window, but async
executeSoon(function() {
ok(win.closed, "Window is closed");
testComplete(win);
});
},
function (win, tabbrowser, tab) {
var newTab = tabbrowser.addTab();
var newBrowser = newTab.linkedBrowser;
tabbrowser.removeTab(tab);
ok(!win.closed, "Window stays open");
if (!win.closed) {
is(tabbrowser.tabContainer.childElementCount, 1, "Window has one tab");
is(tabbrowser.browsers.length, 1, "Window has one browser");
is(tabbrowser.selectedTab, newTab, "Remaining tab is selected");
is(tabbrowser.selectedBrowser, newBrowser, "Browser for remaining tab is selected");
is(tabbrowser.mTabBox.selectedPanel, newBrowser.parentNode.parentNode.parentNode.parentNode, "Panel for remaining tab is selected");
}
testComplete(win);
}
];
function test() {
waitForExplicitFinish();
runOneTest();
}
function testComplete(win) {
win.close();
if (runs.length)
runOneTest();
else
finish();
}
function runOneTest() {
add_task(function* () {
var win = openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no");
yield SimpleTest.promiseFocus(win);
win.addEventListener("load", function () {
win.removeEventListener("load", arguments.callee, false);
let tab = win.gBrowser.tabContainer.firstChild;
yield promiseTabLoadEvent(tab, getRootDirectory(gTestPath) + "test_bug462673.html");
var tab = win.gBrowser.tabContainer.firstChild;
var browser = tab.linkedBrowser;
is(win.gBrowser.browsers.length, 2, "test_bug462673.html has opened a second tab");
is(win.gBrowser.selectedTab, tab.nextSibling, "dependent tab is selected");
win.gBrowser.removeTab(tab);
browser.addEventListener("load", function () {
browser.removeEventListener("load", arguments.callee, true);
// Closing a tab will also close its parent chrome window, but async
yield promiseWindowWillBeClosed(win);
});
executeSoon(function () {
runs.shift()(win, win.gBrowser, tab);
});
}, true);
add_task(function* () {
var win = openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no");
yield SimpleTest.promiseFocus(win);
var rootDir = getRootDirectory(gTestPath);
browser.contentWindow.location = rootDir + "test_bug462673.html"
}, false);
}
let tab = win.gBrowser.tabContainer.firstChild;
yield promiseTabLoadEvent(tab, getRootDirectory(gTestPath) + "test_bug462673.html");
var newTab = win.gBrowser.addTab();
var newBrowser = newTab.linkedBrowser;
win.gBrowser.removeTab(tab);
ok(!win.closed, "Window stays open");
if (!win.closed) {
is(win.gBrowser.tabContainer.childElementCount, 1, "Window has one tab");
is(win.gBrowser.browsers.length, 1, "Window has one browser");
is(win.gBrowser.selectedTab, newTab, "Remaining tab is selected");
is(win.gBrowser.selectedBrowser, newBrowser, "Browser for remaining tab is selected");
is(win.gBrowser.mTabBox.selectedPanel, newBrowser.parentNode.parentNode.parentNode.parentNode, "Panel for remaining tab is selected");
}
yield promiseWindowClosed(win);
});