forked from mirrors/gecko-dev
e930b89c34
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
82 lines
3.3 KiB
JavaScript
82 lines
3.3 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* 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/. */
|
|
|
|
const {SessionStore} = ChromeUtils.import("resource:///modules/sessionstore/SessionStore.jsm");
|
|
|
|
add_task(async function testClosedTabData() {
|
|
/** Test for Bug 461634 **/
|
|
|
|
const REMEMBER = Date.now(), FORGET = Math.random();
|
|
let test_state = { windows: [{ "tabs": [{ "entries": [] }], _closedTabs: [
|
|
{ state: { entries: [{ url: "http://www.example.net/" }] }, title: FORGET },
|
|
{ state: { entries: [{ url: "http://www.example.net/" }] }, title: REMEMBER },
|
|
{ state: { entries: [{ url: "http://www.example.net/" }] }, title: FORGET },
|
|
{ state: { entries: [{ url: "http://www.example.net/" }] }, title: REMEMBER },
|
|
] }] };
|
|
let remember_count = 2;
|
|
|
|
function countByTitle(aClosedTabList, aTitle) {
|
|
return aClosedTabList.filter(aData => aData.title == aTitle).length;
|
|
}
|
|
|
|
function testForError(aFunction) {
|
|
try {
|
|
aFunction();
|
|
return false;
|
|
} catch (ex) {
|
|
return ex.name == "NS_ERROR_ILLEGAL_VALUE";
|
|
}
|
|
}
|
|
|
|
// Open a window and add the above closed tab list.
|
|
let newWin = openDialog(location, "", "chrome,all,dialog=no");
|
|
await promiseWindowLoaded(newWin);
|
|
|
|
Services.prefs.setIntPref("browser.sessionstore.max_tabs_undo",
|
|
test_state.windows[0]._closedTabs.length);
|
|
await setWindowState(newWin, test_state);
|
|
|
|
let closedTabs = SessionStore.getClosedTabData(newWin, false);
|
|
|
|
// Verify that non JSON serialized data is the same as JSON serialized data.
|
|
is(JSON.stringify(closedTabs), SessionStore.getClosedTabData(newWin),
|
|
"Non-serialized data is the same as serialized data");
|
|
|
|
is(closedTabs.length, test_state.windows[0]._closedTabs.length,
|
|
"Closed tab list has the expected length");
|
|
is(countByTitle(closedTabs, FORGET),
|
|
test_state.windows[0]._closedTabs.length - remember_count,
|
|
"The correct amout of tabs are to be forgotten");
|
|
is(countByTitle(closedTabs, REMEMBER), remember_count,
|
|
"Everything is set up");
|
|
|
|
// All of the following calls with illegal arguments should throw NS_ERROR_ILLEGAL_VALUE.
|
|
ok(testForError(() => ss.forgetClosedTab({}, 0)),
|
|
"Invalid window for forgetClosedTab throws");
|
|
ok(testForError(() => ss.forgetClosedTab(newWin, -1)),
|
|
"Invalid tab for forgetClosedTab throws");
|
|
ok(testForError(() => ss.forgetClosedTab(newWin, test_state.windows[0]._closedTabs.length + 1)),
|
|
"Invalid tab for forgetClosedTab throws");
|
|
|
|
// Remove third tab, then first tab.
|
|
ss.forgetClosedTab(newWin, 2);
|
|
ss.forgetClosedTab(newWin, null);
|
|
|
|
closedTabs = SessionStore.getClosedTabData(newWin, false);
|
|
|
|
// Verify that non JSON serialized data is the same as JSON serialized data.
|
|
is(JSON.stringify(closedTabs), SessionStore.getClosedTabData(newWin),
|
|
"Non-serialized data is the same as serialized data");
|
|
|
|
is(closedTabs.length, remember_count,
|
|
"The correct amout of tabs was removed");
|
|
is(countByTitle(closedTabs, FORGET), 0,
|
|
"All tabs specifically forgotten were indeed removed");
|
|
is(countByTitle(closedTabs, REMEMBER), remember_count,
|
|
"... and tabs not specifically forgetten weren't");
|
|
|
|
// Clean up.
|
|
Services.prefs.clearUserPref("browser.sessionstore.max_tabs_undo");
|
|
await BrowserTestUtils.closeWindow(newWin);
|
|
});
|