Bug 1318583: Part 4 - Ensure the correct browser window is focused for tests that require it. r?aswan
MozReview-Commit-ID: ETAY8gLOrsU
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_popup_resize.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_popup_resize.js
@@ -293,12 +293,14 @@ add_task(function* testBrowserActionMenu
if (win.screenX == left && win.screenY == top) {
break;
}
yield delay(100);
}
+ yield SimpleTest.promiseFocus(win);
+
yield testPopupSize(true, win, "bottom");
yield BrowserTestUtils.closeWindow(win);
});
--- a/browser/components/extensions/test/browser/browser_ext_commands_execute_browser_action.js
+++ b/browser/components/extensions/test/browser/browser_ext_commands_execute_browser_action.js
@@ -68,16 +68,18 @@ function* testExecuteBrowserActionWithOp
let extension = ExtensionTestUtils.loadExtension(extensionOptions);
extension.onMessage("send-keys", () => {
EventUtils.synthesizeKey("j", {altKey: true, shiftKey: true});
});
yield extension.startup();
+ yield SimpleTest.promiseFocus(window);
+
if (options.inArea) {
let widget = getBrowserActionWidget(extension);
CustomizableUI.addWidgetToArea(widget.id, options.inArea);
}
extension.sendMessage("withPopup", options.withPopup);
if (options.withPopup) {
--- a/browser/components/extensions/test/browser/browser_ext_omnibox.js
+++ b/browser/components/extensions/test/browser/browser_ext_omnibox.js
@@ -189,16 +189,17 @@ add_task(function* () {
text: expectedText,
disposition: expectedDisposition,
});
}
function* testSuggestions(info) {
extension.sendMessage("set-synchronous", {synchronous: false});
+ /* eslint-disable mozilla/no-cpows-in-tests */
function expectSuggestion({content, description}, index) {
let item = gURLBar.popup.richlistbox.children[index + 1]; // Skip the heuristic result.
ok(!!item, "Expected item to exist");
is(item.getAttribute("title"), description,
`Expected suggestion to have title: "${description}".`);
is(item.getAttribute("displayurl"), `${keyword} ${content}`,
@@ -217,16 +218,18 @@ add_task(function* () {
text,
disposition: "currentTab",
});
}
yield setup();
yield extension.startup();
+ yield SimpleTest.promiseFocus(window);
+
yield testInputEvents();
// Test the heuristic result with default suggestions.
yield testHeuristicResult("Generated extension", false /* setDefaultSuggestion */);
yield testHeuristicResult("hello world", true /* setDefaultSuggestion */);
yield testHeuristicResult("foo bar", true /* setDefaultSuggestion */);
let suggestions = [
--- a/browser/components/extensions/test/browser/browser_ext_webNavigation_urlbar_transitions.js
+++ b/browser/components/extensions/test/browser/browser_ext_webNavigation_urlbar_transitions.js
@@ -100,16 +100,17 @@ add_task(function* test_webnavigation_ur
let extension = ExtensionTestUtils.loadExtension({
background: backgroundScript,
manifest: {
permissions: ["webNavigation"],
},
});
yield extension.startup();
+ yield SimpleTest.promiseFocus(window);
yield extension.awaitMessage("ready");
gURLBar.focus();
gURLBar.textValue = "http://example.com/?q=typed";
EventUtils.synthesizeKey("VK_RETURN", {altKey: true});
@@ -145,16 +146,17 @@ add_task(function* test_webnavigation_ur
});
yield addBookmark({
title: "Bookmark To Click",
url: "http://example.com/?q=bookmark",
});
yield extension.startup();
+ yield SimpleTest.promiseFocus(window);
yield extension.awaitMessage("ready");
yield promiseAutocompleteResultPopup("Bookmark To Click");
let item = gURLBar.popup.richlistbox.getItemAtIndex(1);
item.click();
yield extension.awaitFinish("webNavigation.from_address_bar.auto_bookmark");
@@ -190,16 +192,17 @@ add_task(function* test_webnavigation_ur
yield addBookmark({
title: "Test Keyword",
url: "http://example.com/?q=%s",
keyword: "testkw",
});
yield extension.startup();
+ yield SimpleTest.promiseFocus(window);
yield extension.awaitMessage("ready");
yield promiseAutocompleteResultPopup("testkw search");
let item = gURLBar.popup.richlistbox.getItemAtIndex(0);
item.click();
@@ -230,16 +233,17 @@ add_task(function* test_webnavigation_ur
let extension = ExtensionTestUtils.loadExtension({
background: backgroundScript,
manifest: {
permissions: ["webNavigation"],
},
});
yield extension.startup();
+ yield SimpleTest.promiseFocus(window);
yield extension.awaitMessage("ready");
yield prepareSearchEngine();
yield promiseAutocompleteResultPopup("foo");
let item = gURLBar.popup.richlistbox.getItemAtIndex(0);
item.click();
--- a/browser/components/extensions/test/browser/browser_ext_windows_events.js
+++ b/browser/components/extensions/test/browser/browser_ext_windows_events.js
@@ -99,16 +99,18 @@ add_task(function* testWindowsEvents() {
yield BrowserTestUtils.closeWindow(win2);
winId = yield extension.awaitMessage(`window-removed`);
is(winId, win2Id, "Got removed event for the correct window ID.");
info(`Close browser window 1`);
yield BrowserTestUtils.closeWindow(win1);
+ win1.focus();
+
winId = yield extension.awaitMessage(`window-removed`);
is(winId, win1Id, "Got removed event for the correct window ID.");
winId = yield extension.awaitMessage(`window-focus-changed`);
is(winId, currentWindowId, "Got focus change event for the correct window ID.");
yield extension.awaitFinish("windows.events");
yield extension.unload();