mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 21:28:04 +02:00
***
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
131 lines
4.7 KiB
JavaScript
131 lines
4.7 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/. */
|
|
|
|
let {ForgetAboutSite} = ChromeUtils.import("resource://gre/modules/ForgetAboutSite.jsm");
|
|
|
|
function promiseClearHistory() {
|
|
return new Promise(resolve => {
|
|
let observer = {
|
|
observe(aSubject, aTopic, aData) {
|
|
Services.obs.removeObserver(this, "browser:purge-session-history-for-domain");
|
|
resolve();
|
|
},
|
|
};
|
|
Services.obs.addObserver(observer, "browser:purge-session-history-for-domain");
|
|
});
|
|
}
|
|
|
|
add_task(async function() {
|
|
// utility functions
|
|
function countClosedTabsByTitle(aClosedTabList, aTitle) {
|
|
return aClosedTabList.filter(aData => aData.title == aTitle).length;
|
|
}
|
|
|
|
function countOpenTabsByTitle(aOpenTabList, aTitle) {
|
|
return aOpenTabList.filter(aData => aData.entries.some(aEntry => aEntry.title == aTitle)).length;
|
|
}
|
|
|
|
// backup old state
|
|
let oldState = ss.getBrowserState();
|
|
let oldState_wins = JSON.parse(oldState).windows.length;
|
|
if (oldState_wins != 1)
|
|
ok(false, "oldState in test_purge has " + oldState_wins + " windows instead of 1");
|
|
|
|
// create a new state for testing
|
|
const REMEMBER = Date.now(), FORGET = Math.random();
|
|
let testState = {
|
|
windows: [ { tabs: [{ entries: [{ url: "http://example.com/", triggeringPrincipal_base64 }] }], selected: 1 } ],
|
|
_closedWindows: [
|
|
// _closedWindows[0]
|
|
{
|
|
tabs: [
|
|
{ entries: [{ url: "http://example.com/", triggeringPrincipal_base64, title: REMEMBER }] },
|
|
{ entries: [{ url: "http://mozilla.org/", triggeringPrincipal_base64, title: FORGET }] },
|
|
],
|
|
selected: 2,
|
|
title: "mozilla.org",
|
|
_closedTabs: [],
|
|
},
|
|
// _closedWindows[1]
|
|
{
|
|
tabs: [
|
|
{ entries: [{ url: "http://mozilla.org/", triggeringPrincipal_base64, title: FORGET }] },
|
|
{ entries: [{ url: "http://example.com/", triggeringPrincipal_base64, title: REMEMBER }] },
|
|
{ entries: [{ url: "http://example.com/", triggeringPrincipal_base64, title: REMEMBER }] },
|
|
{ entries: [{ url: "http://mozilla.org/", triggeringPrincipal_base64, title: FORGET }] },
|
|
{ entries: [{ url: "http://example.com/", triggeringPrincipal_base64, title: REMEMBER }] },
|
|
],
|
|
selected: 5,
|
|
_closedTabs: [],
|
|
},
|
|
// _closedWindows[2]
|
|
{
|
|
tabs: [
|
|
{ entries: [{ url: "http://example.com/", triggeringPrincipal_base64, title: REMEMBER }] },
|
|
],
|
|
selected: 1,
|
|
_closedTabs: [
|
|
{
|
|
state: {
|
|
entries: [
|
|
{ url: "http://mozilla.org/", triggeringPrincipal_base64, title: FORGET },
|
|
{ url: "http://mozilla.org/again", triggeringPrincipal_base64, title: "doesn't matter" },
|
|
],
|
|
},
|
|
pos: 1,
|
|
title: FORGET,
|
|
},
|
|
{
|
|
state: {
|
|
entries: [
|
|
{ url: "http://example.com", triggeringPrincipal_base64, title: REMEMBER },
|
|
],
|
|
},
|
|
title: REMEMBER,
|
|
},
|
|
],
|
|
},
|
|
],
|
|
};
|
|
|
|
// set browser to test state
|
|
ss.setBrowserState(JSON.stringify(testState));
|
|
|
|
// purge domain & check that we purged correctly for closed windows
|
|
let clearHistoryPromise = promiseClearHistory();
|
|
await ForgetAboutSite.removeDataFromDomain("mozilla.org");
|
|
await clearHistoryPromise;
|
|
|
|
let closedWindowData = JSON.parse(ss.getClosedWindowData());
|
|
|
|
// First set of tests for _closedWindows[0] - tests basics
|
|
let win = closedWindowData[0];
|
|
is(win.tabs.length, 1, "1 tab was removed");
|
|
is(countOpenTabsByTitle(win.tabs, FORGET), 0,
|
|
"The correct tab was removed");
|
|
is(countOpenTabsByTitle(win.tabs, REMEMBER), 1,
|
|
"The correct tab was remembered");
|
|
is(win.selected, 1, "Selected tab has changed");
|
|
is(win.title, REMEMBER, "The window title was correctly updated");
|
|
|
|
// Test more complicated case
|
|
win = closedWindowData[1];
|
|
is(win.tabs.length, 3, "2 tabs were removed");
|
|
is(countOpenTabsByTitle(win.tabs, FORGET), 0,
|
|
"The correct tabs were removed");
|
|
is(countOpenTabsByTitle(win.tabs, REMEMBER), 3,
|
|
"The correct tabs were remembered");
|
|
is(win.selected, 3, "Selected tab has changed");
|
|
is(win.title, REMEMBER, "The window title was correctly updated");
|
|
|
|
// Tests handling of _closedTabs
|
|
win = closedWindowData[2];
|
|
is(countClosedTabsByTitle(win._closedTabs, REMEMBER), 1,
|
|
"The correct number of tabs were removed, and the correct ones");
|
|
is(countClosedTabsByTitle(win._closedTabs, FORGET), 0,
|
|
"All tabs to be forgotten were indeed removed");
|
|
|
|
// restore pre-test state
|
|
ss.setBrowserState(oldState);
|
|
});
|