forked from mirrors/gecko-dev
42028efc71
This method only is async in order to allow callers to wait for a process switch triggered by the call to `loadURI` to be finished before resolving. With DocumentChannel, we should never trigger a process switch eagerly like this again, so we don't need any of the async behaviour here anymore. This part is largely mechanical changes to tests, removing the `await` calls on `loadURI`, and a follow-up part will remove the actual async logic from `BrowserTestUtils.loadURI`. Differential Revision: https://phabricator.services.mozilla.com/D94641
136 lines
3.8 KiB
JavaScript
136 lines
3.8 KiB
JavaScript
// Returns a function suitable for add_task which loads startURL, runs
|
|
// transitionTask and waits for endURL to load, checking that the URLs were
|
|
// loaded in the correct process.
|
|
function makeTest(
|
|
name,
|
|
startURL,
|
|
startProcessIsRemote,
|
|
endURL,
|
|
endProcessIsRemote,
|
|
transitionTask
|
|
) {
|
|
return async function() {
|
|
info("Running test " + name + ", " + transitionTask.name);
|
|
let browser = gBrowser.selectedBrowser;
|
|
|
|
// In non-e10s nothing should be remote
|
|
if (!gMultiProcessBrowser) {
|
|
startProcessIsRemote = false;
|
|
endProcessIsRemote = false;
|
|
}
|
|
|
|
// Load the initial URL and make sure we are in the right initial process
|
|
info("Loading initial URL");
|
|
BrowserTestUtils.loadURI(browser, startURL);
|
|
await BrowserTestUtils.browserLoaded(browser, false, startURL);
|
|
|
|
is(browser.currentURI.spec, startURL, "Shouldn't have been redirected");
|
|
is(
|
|
browser.isRemoteBrowser,
|
|
startProcessIsRemote,
|
|
"Should be displayed in the right process"
|
|
);
|
|
|
|
let docLoadedPromise = BrowserTestUtils.browserLoaded(
|
|
browser,
|
|
false,
|
|
endURL
|
|
);
|
|
await transitionTask(browser, endURL);
|
|
await docLoadedPromise;
|
|
|
|
is(browser.currentURI.spec, endURL, "Should have made it to the final URL");
|
|
is(
|
|
browser.isRemoteBrowser,
|
|
endProcessIsRemote,
|
|
"Should be displayed in the right process"
|
|
);
|
|
};
|
|
}
|
|
|
|
const PATH = (
|
|
getRootDirectory(gTestPath) + "test_process_flags_chrome.html"
|
|
).replace("chrome://mochitests", "");
|
|
|
|
const CHROME = "chrome://mochitests" + PATH;
|
|
const CANREMOTE = "chrome://mochitests-any" + PATH;
|
|
const MUSTREMOTE = "chrome://mochitests-content" + PATH;
|
|
|
|
add_task(async function init() {
|
|
gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, "about:blank", {
|
|
forceNotRemote: true,
|
|
});
|
|
});
|
|
|
|
registerCleanupFunction(() => {
|
|
gBrowser.removeCurrentTab();
|
|
});
|
|
|
|
add_task(async function test_chrome() {
|
|
test_url_for_process_types({
|
|
url: CHROME,
|
|
chromeResult: true,
|
|
webContentResult: false,
|
|
privilegedAboutContentResult: false,
|
|
privilegedMozillaContentResult: false,
|
|
extensionProcessResult: false,
|
|
});
|
|
});
|
|
|
|
add_task(async function test_any() {
|
|
test_url_for_process_types({
|
|
url: CANREMOTE,
|
|
chromeResult: true,
|
|
webContentResult: true,
|
|
privilegedAboutContentResult: false,
|
|
privilegedMozillaContentResult: false,
|
|
extensionProcessResult: false,
|
|
});
|
|
});
|
|
|
|
add_task(async function test_remote() {
|
|
test_url_for_process_types({
|
|
url: MUSTREMOTE,
|
|
chromeResult: false,
|
|
webContentResult: true,
|
|
privilegedAboutContentResult: false,
|
|
privilegedMozillaContentResult: false,
|
|
extensionProcessResult: false,
|
|
});
|
|
});
|
|
|
|
// The set of page transitions
|
|
var TESTS = [
|
|
["chrome -> chrome", CHROME, false, CHROME, false],
|
|
["chrome -> canremote", CHROME, false, CANREMOTE, false],
|
|
["chrome -> mustremote", CHROME, false, MUSTREMOTE, true],
|
|
["remote -> chrome", MUSTREMOTE, true, CHROME, false],
|
|
["remote -> canremote", MUSTREMOTE, true, CANREMOTE, true],
|
|
["remote -> mustremote", MUSTREMOTE, true, MUSTREMOTE, true],
|
|
];
|
|
|
|
// The different ways to transition from one page to another
|
|
var TRANSITIONS = [
|
|
// Loads the new page by calling browser.loadURI directly
|
|
async function loadURI(browser, uri) {
|
|
info("Calling browser.loadURI");
|
|
BrowserTestUtils.loadURI(browser, uri);
|
|
},
|
|
|
|
// Loads the new page by finding a link with the right href in the document and
|
|
// clicking it
|
|
function clickLink(browser, uri) {
|
|
info("Clicking link");
|
|
SpecialPowers.spawn(browser, [uri], function frame_script(frameUri) {
|
|
let link = content.document.querySelector("a[href='" + frameUri + "']");
|
|
link.click();
|
|
});
|
|
},
|
|
];
|
|
|
|
// Creates a set of test tasks, one for each combination of TESTS and TRANSITIONS.
|
|
for (let test of TESTS) {
|
|
for (let transition of TRANSITIONS) {
|
|
add_task(makeTest(...test, transition));
|
|
}
|
|
}
|