forked from mirrors/gecko-dev
***
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
138 lines
4.3 KiB
JavaScript
138 lines
4.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/. */
|
|
|
|
"use strict";
|
|
|
|
add_task(async function() {
|
|
for (let i = 0; i < 3; ++i) {
|
|
let tab = BrowserTestUtils.addTab(gBrowser, "http://example.com/", { userContextId: i });
|
|
let browser = tab.linkedBrowser;
|
|
|
|
await promiseBrowserLoaded(browser);
|
|
|
|
let tab2 = gBrowser.duplicateTab(tab);
|
|
Assert.equal(tab2.getAttribute("usercontextid"), i);
|
|
let browser2 = tab2.linkedBrowser;
|
|
await promiseTabRestored(tab2);
|
|
|
|
await ContentTask.spawn(browser2, { expectedId: i }, async function(args) {
|
|
let loadContext = docShell.QueryInterface(Ci.nsILoadContext);
|
|
Assert.equal(loadContext.originAttributes.userContextId,
|
|
args.expectedId, "The docShell has the correct userContextId");
|
|
});
|
|
|
|
BrowserTestUtils.removeTab(tab);
|
|
BrowserTestUtils.removeTab(tab2);
|
|
}
|
|
});
|
|
|
|
add_task(async function() {
|
|
let tab = BrowserTestUtils.addTab(gBrowser, "http://example.com/", { userContextId: 1 });
|
|
let browser = tab.linkedBrowser;
|
|
|
|
await promiseBrowserLoaded(browser);
|
|
|
|
gBrowser.selectedTab = tab;
|
|
|
|
let tab2 = gBrowser.duplicateTab(tab);
|
|
let browser2 = tab2.linkedBrowser;
|
|
await promiseTabRestored(tab2);
|
|
|
|
await ContentTask.spawn(browser2, { expectedId: 1 }, async function(args) {
|
|
Assert.equal(docShell.getOriginAttributes().userContextId,
|
|
args.expectedId,
|
|
"The docShell has the correct userContextId");
|
|
});
|
|
|
|
BrowserTestUtils.removeTab(tab);
|
|
BrowserTestUtils.removeTab(tab2);
|
|
});
|
|
|
|
add_task(async function() {
|
|
let tab = BrowserTestUtils.addTab(gBrowser, "http://example.com/", { userContextId: 1 });
|
|
let browser = tab.linkedBrowser;
|
|
|
|
await promiseBrowserLoaded(browser);
|
|
|
|
gBrowser.removeTab(tab);
|
|
|
|
let tab2 = ss.undoCloseTab(window, 0);
|
|
Assert.equal(tab2.getAttribute("usercontextid"), 1);
|
|
await promiseTabRestored(tab2);
|
|
await ContentTask.spawn(tab2.linkedBrowser, { expectedId: 1 }, async function(args) {
|
|
Assert.equal(docShell.getOriginAttributes().userContextId,
|
|
args.expectedId,
|
|
"The docShell has the correct userContextId");
|
|
});
|
|
|
|
BrowserTestUtils.removeTab(tab2);
|
|
});
|
|
|
|
// Opens "uri" in a new tab with the provided userContextId and focuses it.
|
|
// Returns the newly opened tab.
|
|
async function openTabInUserContext(userContextId) {
|
|
// Open the tab in the correct userContextId.
|
|
let tab = BrowserTestUtils.addTab(gBrowser, "http://example.com", { userContextId });
|
|
|
|
// Select tab and make sure its browser is focused.
|
|
gBrowser.selectedTab = tab;
|
|
tab.ownerGlobal.focus();
|
|
|
|
let browser = gBrowser.getBrowserForTab(tab);
|
|
await BrowserTestUtils.browserLoaded(browser);
|
|
return { tab, browser };
|
|
}
|
|
|
|
function waitForNewCookie() {
|
|
return new Promise(resolve => {
|
|
Services.obs.addObserver(function observer(subj, topic, data) {
|
|
if (data == "added") {
|
|
Services.obs.removeObserver(observer, topic);
|
|
resolve();
|
|
}
|
|
}, "session-cookie-changed");
|
|
});
|
|
}
|
|
|
|
add_task(async function test() {
|
|
const USER_CONTEXTS = [
|
|
"default",
|
|
"personal",
|
|
"work",
|
|
];
|
|
|
|
const { TabStateFlusher } = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm");
|
|
|
|
// Make sure userContext is enabled.
|
|
await SpecialPowers.pushPrefEnv({
|
|
"set": [ [ "privacy.userContext.enabled", true ] ],
|
|
});
|
|
|
|
Services.cookies.removeAll();
|
|
|
|
for (let userContextId of Object.keys(USER_CONTEXTS)) {
|
|
// Load the page in 3 different contexts and set a cookie
|
|
// which should only be visible in that context.
|
|
let cookie = USER_CONTEXTS[userContextId];
|
|
|
|
// Open our tab in the given user context.
|
|
let { tab, browser } = await openTabInUserContext(userContextId);
|
|
|
|
await Promise.all([
|
|
waitForNewCookie(),
|
|
ContentTask.spawn(browser, cookie,
|
|
passedCookie => content.document.cookie = passedCookie),
|
|
]);
|
|
|
|
// Ensure the tab's session history is up-to-date.
|
|
await TabStateFlusher.flush(browser);
|
|
|
|
// Remove the tab.
|
|
gBrowser.removeTab(tab);
|
|
}
|
|
|
|
let state = JSON.parse(SessionStore.getBrowserState());
|
|
is(state.cookies.length, USER_CONTEXTS.length,
|
|
"session restore should have each container's cookie");
|
|
});
|