Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1603266 - Flush irrelevant events when testing context creation; r=remote-protocol-reviewers,whimboo

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D57047

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Maja Frydrychowicz 2019-12-13 15:51:46 +00:00
parent 415bdaeb0c
commit 260c75a1d1
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
remote/test/browser/head.js
View File

@ -17,10 +17,8 @@ const { RemoteAgent } = ChromeUtils.import(
const add_plain_task = add_task.bind(this);
this.add_task = function(taskFn, opts = {}) {
const { createTab = true } = opts;
add_plain_task(async function() {
let client;
await RemoteAgent.listen(Services.io.newURI("http://localhost:9222"));
info("CDP server started");

19
remote/test/browser/page/browser_scriptToEvaluateOnNewDocument.js
View File

@ -43,7 +43,9 @@ add_task(async function addScriptAfterNavigation({ Page }) {
});
add_task(async function addWithIsolatedWorldAndNavigate({ Page, Runtime }) {
const contextsCreated = recordContextCreated(Runtime, 3);
await Runtime.enable();
info(`Navigating to ${DOC}`);
const { frameId } = await Page.navigate({ url: DOC });
await Page.addScriptToEvaluateOnNewDocument({
source: "1 + 1;",
@ -54,6 +56,8 @@ add_task(async function addWithIsolatedWorldAndNavigate({ Page, Runtime }) {
worldName: WORLD,
grantUniversalAccess: true,
});
// flush context-created events for the steps above
await contextsCreated;
const contexts = await checkIsolatedContextAfterLoad(
Runtime,
toDataURL("<p>Next")
@ -85,10 +89,8 @@ add_task(async function addTwoScriptsWithIsolatedWorld({ Page, Runtime }) {
await checkIsolatedContextAfterLoad(Runtime, DOC, names);
});
async function checkIsolatedContextAfterLoad(Runtime, url, names = [WORLD]) {
// At least the default context will get created
const expected = names.length + 1;
const contextsCreated = new Promise(resolve => {
function recordContextCreated(Runtime, expectedCount) {
return new Promise(resolve => {
const ctx = [];
const unsubscribe = Runtime.executionContextCreated(payload => {
ctx.push(payload.context);
@ -96,7 +98,7 @@ async function checkIsolatedContextAfterLoad(Runtime, url, names = [WORLD]) {
`Runtime.executionContextCreated: ${payload.context.auxData.type}` +
`\n\turl ${payload.context.origin}`
);
if (ctx.length > expected) {
if (ctx.length > expectedCount) {
unsubscribe();
resolve(ctx);
}
@ -106,6 +108,13 @@ async function checkIsolatedContextAfterLoad(Runtime, url, names = [WORLD]) {
resolve(ctx);
});
});
}
async function checkIsolatedContextAfterLoad(Runtime, url, names = [WORLD]) {
// At least the default context will get created
const expected = names.length + 1;
const contextsCreated = recordContextCreated(Runtime, expected);
info(`Navigating to ${url}`);
await loadURL(url);
const contexts = await contextsCreated;
is(contexts.length, expected, "Expected number of contexts got created");