Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1100291 - Fix a few tests to wait until a newly opened tab is loaded before using for further testing r=Gijs

Browse Source
This commit is contained in:
Tim Taubert 2015-03-17 18:49:54 +01:00
parent 0e3c094d7a
commit 91752e0cf4
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/base/content/test/general/browser_bug1064280_changeUrlInPinnedTab.js
View File

@ -3,13 +3,16 @@
"use strict"; "use strict";
add_task(function(){ add_task(function* () {
// Test that changing the URL in a pinned tab works correctly // Test that changing the URL in a pinned tab works correctly
let TEST_LINK_INITIAL = "about:"; let TEST_LINK_INITIAL = "about:";
let TEST_LINK_CHANGED = "about:support"; let TEST_LINK_CHANGED = "about:support";
let appTab = gBrowser.addTab(TEST_LINK_INITIAL); let appTab = gBrowser.addTab(TEST_LINK_INITIAL);
let browser = appTab.linkedBrowser;
yield BrowserTestUtils.browserLoaded(browser);
gBrowser.pinTab(appTab); gBrowser.pinTab(appTab);
is(appTab.pinned, true, "Tab was successfully pinned"); is(appTab.pinned, true, "Tab was successfully pinned");
@ -20,9 +23,8 @@ add_task(function(){
gURLBar.focus(); gURLBar.focus();
gURLBar.value = TEST_LINK_CHANGED; gURLBar.value = TEST_LINK_CHANGED;
let promisePageload = promiseTabLoadEvent(appTab);
goButton.click(); goButton.click();
yield promisePageload; yield BrowserTestUtils.browserLoaded(browser);
is(appTab.linkedBrowser.currentURI.spec, TEST_LINK_CHANGED, is(appTab.linkedBrowser.currentURI.spec, TEST_LINK_CHANGED,
"New page loaded in the app tab"); "New page loaded in the app tab");

15
browser/base/content/test/general/browser_urlbarSearchSingleWordNotification.js
View File

@ -60,13 +60,15 @@ function* runURLBarSearchTest(valueToOpen, expectSearch, expectNotification, aWi
} }
add_task(function* test_navigate_full_domain() { add_task(function* test_navigate_full_domain() {
let tab = gBrowser.selectedTab = gBrowser.addTab(); let tab = gBrowser.selectedTab = gBrowser.addTab("about:blank");
yield BrowserTestUtils.browserLoaded(tab.linkedBrowser);
yield* runURLBarSearchTest("www.mozilla.org", false, false); yield* runURLBarSearchTest("www.mozilla.org", false, false);
gBrowser.removeTab(tab); gBrowser.removeTab(tab);
}); });
add_task(function* test_navigate_numbers() { add_task(function* test_navigate_numbers() {
let tab = gBrowser.selectedTab = gBrowser.addTab(); let tab = gBrowser.selectedTab = gBrowser.addTab("about:blank");
yield BrowserTestUtils.browserLoaded(tab.linkedBrowser);
yield* runURLBarSearchTest("1234", true, false); yield* runURLBarSearchTest("1234", true, false);
gBrowser.removeTab(tab); gBrowser.removeTab(tab);
}); });
@ -84,7 +86,8 @@ function get_test_function_for_localhost_with_hostname(hostName, isPrivate) {
win = window; win = window;
} }
let browser = win.gBrowser; let browser = win.gBrowser;
let tab = browser.selectedTab = browser.addTab(); let tab = browser.selectedTab = browser.addTab("about:blank");
yield BrowserTestUtils.browserLoaded(tab.linkedBrowser);
Services.prefs.setBoolPref(pref, false); Services.prefs.setBoolPref(pref, false);
yield* runURLBarSearchTest(hostName, true, true, win); yield* runURLBarSearchTest(hostName, true, true, win);
@ -102,7 +105,8 @@ function get_test_function_for_localhost_with_hostname(hostName, isPrivate) {
browser.removeTab(tab); browser.removeTab(tab);
// Now try again with the pref set. // Now try again with the pref set.
tab = browser.selectedTab = browser.addTab(); tab = browser.selectedTab = browser.addTab("about:blank");
yield BrowserTestUtils.browserLoaded(tab.linkedBrowser);
// In a private window, the notification should appear again. // In a private window, the notification should appear again.
yield* runURLBarSearchTest(hostName, isPrivate, isPrivate, win); yield* runURLBarSearchTest(hostName, isPrivate, isPrivate, win);
browser.removeTab(tab); browser.removeTab(tab);
@ -122,7 +126,8 @@ add_task(get_test_function_for_localhost_with_hostname("localhost."));
add_task(get_test_function_for_localhost_with_hostname("localhost", true)); add_task(get_test_function_for_localhost_with_hostname("localhost", true));
add_task(function* test_navigate_invalid_url() { add_task(function* test_navigate_invalid_url() {
let tab = gBrowser.selectedTab = gBrowser.addTab(); let tab = gBrowser.selectedTab = gBrowser.addTab("about:blank");
yield BrowserTestUtils.browserLoaded(tab.linkedBrowser);
yield* runURLBarSearchTest("mozilla is awesome", true, false); yield* runURLBarSearchTest("mozilla is awesome", true, false);
gBrowser.removeTab(tab); gBrowser.removeTab(tab);
}); });

3
browser/base/content/test/general/browser_urlbar_search_healthreport.js
View File

@ -39,7 +39,8 @@ add_task(function* test_healthreport_search_recording() {
} }
} }
let tab = gBrowser.addTab(); let tab = gBrowser.addTab("about:blank");
yield BrowserTestUtils.browserLoaded(tab.linkedBrowser);
gBrowser.selectedTab = tab; gBrowser.selectedTab = tab;
let searchStr = "firefox health report"; let searchStr = "firefox health report";