mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-02 07:05:24 +00:00
Bug 1171708 - Rewrite browser_490040.js to be more Task-y. r=billm
--HG-- extra : commitid : JCQ8NQhsmhB extra : rebase_source : aeccafbe58698693df5adabeee94d21aee73426a extra : source : c60c33f9b5732dfdc3e01fbec2905de31d441f7e
This commit is contained in:
parent
dd0f6eee8f
commit
dc20c7f9ef
@ -2,122 +2,64 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
function test() {
|
||||
/** Test for Bug 490040 **/
|
||||
// Only windows with open tabs are restorable. Windows where a lone tab is
|
||||
// detached may have _closedTabs, but is left with just an empty tab.
|
||||
const STATES = [{
|
||||
shouldBeAdded: true,
|
||||
windowState: {
|
||||
windows: [{
|
||||
tabs: [{ entries: [{ url: "http://example.com", title: "example.com" }] }],
|
||||
selected: 1,
|
||||
_closedTabs: []
|
||||
}]
|
||||
}
|
||||
}, {
|
||||
shouldBeAdded: false,
|
||||
windowState: {
|
||||
windows: [{
|
||||
tabs: [{ entries: [] }],
|
||||
_closedTabs: []
|
||||
}]
|
||||
}
|
||||
}, {
|
||||
shouldBeAdded: false,
|
||||
windowState: {
|
||||
windows: [{
|
||||
tabs: [{ entries: [] }],
|
||||
_closedTabs: [{ state: { entries: [{ url: "http://example.com", index: 1 }] } }]
|
||||
}]
|
||||
}
|
||||
}, {
|
||||
shouldBeAdded: false,
|
||||
windowState: {
|
||||
windows: [{
|
||||
tabs: [{ entries: [] }],
|
||||
_closedTabs: [],
|
||||
extData: { keyname: "pi != " + Math.random() }
|
||||
}]
|
||||
}
|
||||
}];
|
||||
|
||||
waitForExplicitFinish();
|
||||
|
||||
function testWithState(aState) {
|
||||
add_task(function* test_bug_490040() {
|
||||
for (let state of STATES) {
|
||||
// Ensure we can store the window if needed.
|
||||
let startingClosedWindowCount = ss.getClosedWindowCount();
|
||||
yield pushPrefs(["browser.sessionstore.max_windows_undo",
|
||||
startingClosedWindowCount + 1]);
|
||||
|
||||
let curClosedWindowCount = ss.getClosedWindowCount();
|
||||
gPrefService.setIntPref("browser.sessionstore.max_windows_undo",
|
||||
curClosedWindowCount + 1);
|
||||
let win = yield BrowserTestUtils.openNewBrowserWindow();
|
||||
|
||||
var origWin;
|
||||
function windowObserver(aSubject, aTopic, aData) {
|
||||
let theWin = aSubject.QueryInterface(Ci.nsIDOMWindow);
|
||||
if (origWin && theWin != origWin)
|
||||
return;
|
||||
|
||||
switch (aTopic) {
|
||||
case "domwindowopened":
|
||||
origWin = theWin;
|
||||
theWin.addEventListener("load", function () {
|
||||
theWin.removeEventListener("load", arguments.callee, false);
|
||||
executeSoon(function () {
|
||||
// Close the window as soon as the first tab loads, or
|
||||
// immediately if there are no tabs.
|
||||
if (aState.windowState.windows[0].tabs[0].entries.length) {
|
||||
theWin.gBrowser.addEventListener("load", function() {
|
||||
theWin.gBrowser.removeEventListener("load",
|
||||
arguments.callee, true);
|
||||
theWin.close();
|
||||
}, true);
|
||||
} else {
|
||||
executeSoon(function () {
|
||||
theWin.close();
|
||||
});
|
||||
}
|
||||
ss.setWindowState(theWin, JSON.stringify(aState.windowState),
|
||||
true);
|
||||
});
|
||||
}, false);
|
||||
break;
|
||||
|
||||
case "domwindowclosed":
|
||||
Services.ww.unregisterNotification(windowObserver);
|
||||
// Use executeSoon to ensure this happens after SS observer.
|
||||
executeSoon(function () {
|
||||
is(ss.getClosedWindowCount(),
|
||||
curClosedWindowCount + (aState.shouldBeAdded ? 1 : 0),
|
||||
"That window should " + (aState.shouldBeAdded ? "" : "not ") +
|
||||
"be restorable");
|
||||
executeSoon(runNextTest);
|
||||
});
|
||||
break;
|
||||
}
|
||||
ss.setWindowState(win, JSON.stringify(state.windowState), true);
|
||||
if (state.windowState.windows[0].tabs.length) {
|
||||
yield BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
|
||||
}
|
||||
Services.ww.registerNotification(windowObserver);
|
||||
Services.ww.openWindow(null,
|
||||
location,
|
||||
"_blank",
|
||||
"chrome,all,dialog=no",
|
||||
null);
|
||||
|
||||
yield BrowserTestUtils.closeWindow(win);
|
||||
|
||||
is(ss.getClosedWindowCount(),
|
||||
curClosedWindowCount + (state.shouldBeAdded ? 1 : 0),
|
||||
"That window should " + (state.shouldBeAdded ? "" : "not ") +
|
||||
"be restorable");
|
||||
}
|
||||
|
||||
// Only windows with open tabs are restorable. Windows where a lone tab is
|
||||
// detached may have _closedTabs, but is left with just an empty tab.
|
||||
let states = [
|
||||
{
|
||||
shouldBeAdded: true,
|
||||
windowState: {
|
||||
windows: [{
|
||||
tabs: [{ entries: [{ url: "http://example.com", title: "example.com" }] }],
|
||||
selected: 1,
|
||||
_closedTabs: []
|
||||
}]
|
||||
}
|
||||
},
|
||||
{
|
||||
shouldBeAdded: false,
|
||||
windowState: {
|
||||
windows: [{
|
||||
tabs: [{ entries: [] }],
|
||||
_closedTabs: []
|
||||
}]
|
||||
}
|
||||
},
|
||||
{
|
||||
shouldBeAdded: false,
|
||||
windowState: {
|
||||
windows: [{
|
||||
tabs: [{ entries: [] }],
|
||||
_closedTabs: [{ state: { entries: [{ url: "http://example.com", index: 1 }] } }]
|
||||
}]
|
||||
}
|
||||
},
|
||||
{
|
||||
shouldBeAdded: false,
|
||||
windowState: {
|
||||
windows: [{
|
||||
tabs: [{ entries: [] }],
|
||||
_closedTabs: [],
|
||||
extData: { keyname: "pi != " + Math.random() }
|
||||
}]
|
||||
}
|
||||
}
|
||||
];
|
||||
|
||||
function runNextTest() {
|
||||
if (states.length) {
|
||||
let state = states.shift();
|
||||
testWithState(state);
|
||||
}
|
||||
else {
|
||||
gPrefService.clearUserPref("browser.sessionstore.max_windows_undo");
|
||||
finish();
|
||||
}
|
||||
}
|
||||
runNextTest();
|
||||
}
|
||||
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user