Bug 1345722 - Split webNavigation onCreatedNavigationTarget tests to prevent them to fail intermittently. r=mixedpuppy

MozReview-Commit-ID: 9s8qgBrpAfz

--HG--
rename : browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget.js => browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_contextmenu.js
extra : rebase_source : af796950caf6fae909b3f17f35a0db2c0d5bb908
This commit is contained in:
Luca Greco 2017-03-20 19:38:36 +01:00
parent 58ad9a7a5b
commit 14db3ec8b7
3 changed files with 178 additions and 123 deletions

View File

@ -129,6 +129,7 @@ support-files =
[browser_ext_webNavigation_frameId0.js]
[browser_ext_webNavigation_getFrames.js]
[browser_ext_webNavigation_onCreatedNavigationTarget.js]
[browser_ext_webNavigation_onCreatedNavigationTarget_contextmenu.js]
[browser_ext_webNavigation_onCreatedNavigationTarget_window_open.js]
[browser_ext_webNavigation_urlbar_transitions.js]
[browser_ext_windows.js]

View File

@ -52,14 +52,6 @@ async function runTestCase({extension, openNavTarget, expectedWebNavProps}) {
is(completedNavMsg.url, url, "Got the expected webNavigation.onCompleted url property");
}
async function clickContextMenuItem({pageElementSelector, contextMenuItemLabel}) {
const contentAreaContextMenu = await openContextMenu(pageElementSelector);
const item = contentAreaContextMenu.getElementsByAttribute("label", contextMenuItemLabel);
is(item.length, 1, `found contextMenu item for "${contextMenuItemLabel}"`);
item[0].click();
await closeContextMenu();
}
add_task(function* test_on_created_navigation_target_from_mouse_click() {
const tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, SOURCE_PAGE);
@ -127,59 +119,6 @@ add_task(function* test_on_created_navigation_target_from_mouse_click() {
yield extension.unload();
});
add_task(function* test_on_created_navigation_target_from_context_menu() {
const tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, SOURCE_PAGE);
const extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
permissions: ["webNavigation"],
},
});
yield extension.startup();
const expectedSourceTab = yield extension.awaitMessage("expectedSourceTab");
info("Open link in a new tab from the context menu");
yield runTestCase({
extension,
async openNavTarget() {
await clickContextMenuItem({
pageElementSelector: "#test-create-new-tab-from-context-menu",
contextMenuItemLabel: "Open Link in New Tab",
});
},
expectedWebNavProps: {
sourceTabId: expectedSourceTab.sourceTabId,
sourceFrameId: 0,
url: `${OPENED_PAGE}#new-tab-from-context-menu`,
},
});
info("Open link in a new window from the context menu");
yield runTestCase({
extension,
async openNavTarget() {
await clickContextMenuItem({
pageElementSelector: "#test-create-new-window-from-context-menu",
contextMenuItemLabel: "Open Link in New Window",
});
},
expectedWebNavProps: {
sourceTabId: expectedSourceTab.sourceTabId,
sourceFrameId: 0,
url: `${OPENED_PAGE}#new-window-from-context-menu`,
},
});
yield BrowserTestUtils.removeTab(tab);
yield extension.unload();
});
add_task(function* test_on_created_navigation_target_from_mouse_click_subframe() {
const tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, SOURCE_PAGE);
@ -256,65 +195,3 @@ add_task(function* test_on_created_navigation_target_from_mouse_click_subframe()
yield extension.unload();
});
add_task(function* test_on_created_navigation_target_from_context_menu_subframe() {
const tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, SOURCE_PAGE);
const extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
permissions: ["webNavigation"],
},
});
yield extension.startup();
const expectedSourceTab = yield extension.awaitMessage("expectedSourceTab");
info("Open a subframe link in a new tab from the context menu");
yield runTestCase({
extension,
async openNavTarget() {
await clickContextMenuItem({
pageElementSelector: function() {
// This code runs as a framescript in the child process and it returns the
// target link in the subframe.
return this.content.frames[0] // eslint-disable-line mozilla/no-cpows-in-tests
.document.querySelector("#test-create-new-tab-from-context-menu-subframe");
},
contextMenuItemLabel: "Open Link in New Tab",
});
},
expectedWebNavProps: {
sourceTabId: expectedSourceTab.sourceTabId,
sourceFrameId: expectedSourceTab.sourceTabFrames[1].frameId,
url: `${OPENED_PAGE}#new-tab-from-context-menu-subframe`,
},
});
info("Open a subframe link in a new window from the context menu");
yield runTestCase({
extension,
async openNavTarget() {
await clickContextMenuItem({
pageElementSelector: function() {
// This code runs as a framescript in the child process and it returns the
// target link in the subframe.
return this.content.frames[0] // eslint-disable-line mozilla/no-cpows-in-tests
.document.querySelector("#test-create-new-window-from-context-menu-subframe");
},
contextMenuItemLabel: "Open Link in New Window",
});
},
expectedWebNavProps: {
sourceTabId: expectedSourceTab.sourceTabId,
sourceFrameId: expectedSourceTab.sourceTabFrames[1].frameId,
url: `${OPENED_PAGE}#new-window-from-context-menu-subframe`,
},
});
yield BrowserTestUtils.removeTab(tab);
yield extension.unload();
});

View File

@ -0,0 +1,177 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
const BASE_URL = "http://mochi.test:8888/browser/browser/components/extensions/test/browser";
const SOURCE_PAGE = `${BASE_URL}/webNav_createdTargetSource.html`;
const OPENED_PAGE = `${BASE_URL}/webNav_createdTarget.html`;
async function background() {
const tabs = await browser.tabs.query({active: true, currentWindow: true});
const sourceTabId = tabs[0].id;
const sourceTabFrames = await browser.webNavigation.getAllFrames({tabId: sourceTabId});
browser.webNavigation.onCreatedNavigationTarget.addListener((msg) => {
browser.test.sendMessage("webNavOnCreated", msg);
});
browser.webNavigation.onCompleted.addListener(async (msg) => {
// NOTE: checking the url is currently necessary because of Bug 1252129
// ( Filter out webNavigation events related to new window initialization phase).
if (msg.tabId !== sourceTabId && msg.url !== "about:blank") {
await browser.tabs.remove(msg.tabId);
browser.test.sendMessage("webNavOnCompleted", msg);
}
});
browser.tabs.onCreated.addListener((tab) => {
browser.test.sendMessage("tabsOnCreated", tab.id);
});
browser.test.sendMessage("expectedSourceTab", {
sourceTabId, sourceTabFrames,
});
}
async function runTestCase({extension, openNavTarget, expectedWebNavProps}) {
await openNavTarget();
const webNavMsg = await extension.awaitMessage("webNavOnCreated");
const createdTabId = await extension.awaitMessage("tabsOnCreated");
const completedNavMsg = await extension.awaitMessage("webNavOnCompleted");
let {sourceTabId, sourceFrameId, url} = expectedWebNavProps;
is(webNavMsg.tabId, createdTabId, "Got the expected tabId property");
is(webNavMsg.sourceTabId, sourceTabId, "Got the expected sourceTabId property");
is(webNavMsg.sourceFrameId, sourceFrameId, "Got the expected sourceFrameId property");
is(webNavMsg.url, url, "Got the expected url property");
is(completedNavMsg.tabId, createdTabId, "Got the expected webNavigation.onCompleted tabId property");
is(completedNavMsg.url, url, "Got the expected webNavigation.onCompleted url property");
}
async function clickContextMenuItem({pageElementSelector, contextMenuItemLabel}) {
const contentAreaContextMenu = await openContextMenu(pageElementSelector);
const item = contentAreaContextMenu.getElementsByAttribute("label", contextMenuItemLabel);
is(item.length, 1, `found contextMenu item for "${contextMenuItemLabel}"`);
item[0].click();
await closeContextMenu();
}
add_task(function* test_on_created_navigation_target_from_context_menu() {
const tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, SOURCE_PAGE);
const extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
permissions: ["webNavigation"],
},
});
yield extension.startup();
const expectedSourceTab = yield extension.awaitMessage("expectedSourceTab");
info("Open link in a new tab from the context menu");
yield runTestCase({
extension,
async openNavTarget() {
await clickContextMenuItem({
pageElementSelector: "#test-create-new-tab-from-context-menu",
contextMenuItemLabel: "Open Link in New Tab",
});
},
expectedWebNavProps: {
sourceTabId: expectedSourceTab.sourceTabId,
sourceFrameId: 0,
url: `${OPENED_PAGE}#new-tab-from-context-menu`,
},
});
info("Open link in a new window from the context menu");
yield runTestCase({
extension,
async openNavTarget() {
await clickContextMenuItem({
pageElementSelector: "#test-create-new-window-from-context-menu",
contextMenuItemLabel: "Open Link in New Window",
});
},
expectedWebNavProps: {
sourceTabId: expectedSourceTab.sourceTabId,
sourceFrameId: 0,
url: `${OPENED_PAGE}#new-window-from-context-menu`,
},
});
yield BrowserTestUtils.removeTab(tab);
yield extension.unload();
});
add_task(function* test_on_created_navigation_target_from_context_menu_subframe() {
const tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, SOURCE_PAGE);
const extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
permissions: ["webNavigation"],
},
});
yield extension.startup();
const expectedSourceTab = yield extension.awaitMessage("expectedSourceTab");
info("Open a subframe link in a new tab from the context menu");
yield runTestCase({
extension,
async openNavTarget() {
await clickContextMenuItem({
pageElementSelector: function() {
// This code runs as a framescript in the child process and it returns the
// target link in the subframe.
return this.content.frames[0] // eslint-disable-line mozilla/no-cpows-in-tests
.document.querySelector("#test-create-new-tab-from-context-menu-subframe");
},
contextMenuItemLabel: "Open Link in New Tab",
});
},
expectedWebNavProps: {
sourceTabId: expectedSourceTab.sourceTabId,
sourceFrameId: expectedSourceTab.sourceTabFrames[1].frameId,
url: `${OPENED_PAGE}#new-tab-from-context-menu-subframe`,
},
});
info("Open a subframe link in a new window from the context menu");
yield runTestCase({
extension,
async openNavTarget() {
await clickContextMenuItem({
pageElementSelector: function() {
// This code runs as a framescript in the child process and it returns the
// target link in the subframe.
return this.content.frames[0] // eslint-disable-line mozilla/no-cpows-in-tests
.document.querySelector("#test-create-new-window-from-context-menu-subframe");
},
contextMenuItemLabel: "Open Link in New Window",
});
},
expectedWebNavProps: {
sourceTabId: expectedSourceTab.sourceTabId,
sourceFrameId: expectedSourceTab.sourceTabFrames[1].frameId,
url: `${OPENED_PAGE}#new-window-from-context-menu-subframe`,
},
});
yield BrowserTestUtils.removeTab(tab);
yield extension.unload();
});