|
|
@@ -0,0 +1,12441 @@
|
|
|
+# HG changeset patch
|
|
|
+# User Tooru Fujisawa <arai_a@mac.com>
|
|
|
+# Date 1521425805 -32400
|
|
|
+# Node ID ba58e9052ab972dfad832bb33d35652500fbe54c
|
|
|
+# Parent 3575447ccb6bf1bdf75c58bfc35c767d4e7b70fb
|
|
|
+Bug 1442465 - Part 4.2: Stop unnecessarily awaiting on BrowserTestUtils.removeTab (simple part). r=dao
|
|
|
+
|
|
|
+diff --git a/accessible/tests/browser/general/browser_test_doc_creation.js b/accessible/tests/browser/general/browser_test_doc_creation.js
|
|
|
+--- a/accessible/tests/browser/general/browser_test_doc_creation.js
|
|
|
++++ b/accessible/tests/browser/general/browser_test_doc_creation.js
|
|
|
+@@ -52,14 +52,14 @@ add_task(async function testDocumentCrea
|
|
|
+ let accServiceContent =
|
|
|
+ Cc["@mozilla.org/accessibilityService;1"].getService(
|
|
|
+ Ci.nsIAccessibilityService);
|
|
|
+ ok(!!accServiceContent.getAccessibleFromCache(content.document),
|
|
|
+ "Document accessible is in cache.");
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+
|
|
|
+ accService = null;
|
|
|
+ await shutdownAccessibilityService();
|
|
|
+ });
|
|
|
+diff --git a/accessible/tests/browser/general/browser_test_urlbar.js.1442465-4_2.later b/accessible/tests/browser/general/browser_test_urlbar.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/accessible/tests/browser/general/browser_test_urlbar.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,18 @@
|
|
|
++--- browser_test_urlbar.js
|
|
|
+++++ browser_test_urlbar.js
|
|
|
++@@ -21,14 +21,14 @@ add_task(async function testAutocomplete
|
|
|
++ info("Waiting for accessibility to be created for the richlistbox");
|
|
|
++ let richlistbox = document.getAnonymousElementByAttribute(urlbarPopup, "anonid", "richlistbox");
|
|
|
++ await BrowserTestUtils.waitForCondition(() => accService.getAccessibleFor(richlistbox));
|
|
|
++
|
|
|
++ info("Confirming that the special case is handled in XULListboxAccessible");
|
|
|
++ let accessible = accService.getAccessibleFor(richlistbox);
|
|
|
++ is(accessible.role, ROLE_COMBOBOX_LIST, "Right role");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ registerCleanupFunction(async function() {
|
|
|
++ await shutdownAccessibilityService();
|
|
|
++ });
|
|
|
+diff --git a/accessible/tests/browser/states/browser_test_visibility.js b/accessible/tests/browser/states/browser_test_visibility.js
|
|
|
+--- a/accessible/tests/browser/states/browser_test_visibility.js
|
|
|
++++ b/accessible/tests/browser/states/browser_test_visibility.js
|
|
|
+@@ -30,17 +30,17 @@ async function runTest(browser, accDoc)
|
|
|
+ // first item is scrolled off now (testcase for bug 768786)
|
|
|
+ let firstLi = getAcc("li_first");
|
|
|
+ testStates(firstLi, STATE_OFFSCREEN, 0, STATE_INVISIBLE);
|
|
|
+
|
|
|
+ let newTab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
|
|
|
+ // Accessibles in background tab should have offscreen state and no
|
|
|
+ // invisible state.
|
|
|
+ testStates(getAcc("div"), STATE_OFFSCREEN, 0, STATE_INVISIBLE);
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ }
|
|
|
+
|
|
|
+ addAccessibleTask(`
|
|
|
+ <div id="div" style="border:2px solid blue; width: 500px; height: 110vh;"></div>
|
|
|
+ <input id="input_scrolledoff">
|
|
|
+ <ul style="border:2px solid red; width: 100px; height: 50px; overflow: auto;">
|
|
|
+ <li id="li_first">item1</li><li>item2</li><li>item3</li>
|
|
|
+ <li>item4</li><li>item5</li><li id="li_last">item6</li>
|
|
|
+diff --git a/browser/base/content/test/about/browser_aboutCertError.js b/browser/base/content/test/about/browser_aboutCertError.js
|
|
|
+--- a/browser/base/content/test/about/browser_aboutCertError.js
|
|
|
++++ b/browser/base/content/test/about/browser_aboutCertError.js
|
|
|
+@@ -43,17 +43,17 @@ add_task(async function checkReturnToAbo
|
|
|
+
|
|
|
+ await ContentTaskUtils.waitForEvent(this, "pageshow", true);
|
|
|
+ });
|
|
|
+
|
|
|
+ is(browser.webNavigation.canGoBack, true, "webNavigation.canGoBack");
|
|
|
+ is(browser.webNavigation.canGoForward, false, "!webNavigation.canGoForward");
|
|
|
+ is(gBrowser.currentURI.spec, "about:home", "Went back");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function checkReturnToPreviousPage() {
|
|
|
+ info("Loading a bad cert page and making sure 'return to previous page' goes back");
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, GOOD_PAGE);
|
|
|
+ let browser = gBrowser.selectedBrowser;
|
|
|
+
|
|
|
+ info("Loading and waiting for the cert error");
|
|
|
+@@ -78,17 +78,17 @@ add_task(async function checkReturnToPre
|
|
|
+
|
|
|
+ await ContentTaskUtils.waitForEvent(this, "pageshow", true);
|
|
|
+ });
|
|
|
+
|
|
|
+ is(browser.webNavigation.canGoBack, false, "!webNavigation.canGoBack");
|
|
|
+ is(browser.webNavigation.canGoForward, true, "webNavigation.canGoForward");
|
|
|
+ is(gBrowser.currentURI.spec, GOOD_PAGE, "Went back");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function checkBadStsCert() {
|
|
|
+ info("Loading a badStsCert and making sure exception button doesn't show up");
|
|
|
+ await BrowserTestUtils.openNewForegroundTab(gBrowser, GOOD_PAGE);
|
|
|
+ let browser = gBrowser.selectedBrowser;
|
|
|
+
|
|
|
+ info("Loading and waiting for the cert error");
|
|
|
+@@ -98,17 +98,17 @@ add_task(async function checkBadStsCert(
|
|
|
+
|
|
|
+ let exceptionButtonHidden = await ContentTask.spawn(browser, null, async function() {
|
|
|
+ let doc = content.document;
|
|
|
+ let exceptionButton = doc.getElementById("exceptionDialogButton");
|
|
|
+ return exceptionButton.hidden;
|
|
|
+ });
|
|
|
+ ok(exceptionButtonHidden, "Exception button is hidden");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // This checks that the appinfo.appBuildID starts with a date string,
|
|
|
+ // which is required for the misconfigured system time check.
|
|
|
+ add_task(async function checkAppBuildIDIsDate() {
|
|
|
+ let appBuildID = Services.appinfo.appBuildID;
|
|
|
+ let year = parseInt(appBuildID.substr(0, 4), 10);
|
|
|
+ let month = parseInt(appBuildID.substr(4, 2), 10);
|
|
|
+@@ -169,17 +169,17 @@ add_task(async function checkWrongSystem
|
|
|
+ isnot(message.divDisplay, "none", "Wrong time message information is visible");
|
|
|
+ ok(message.text.includes("clock appears to show the wrong time"),
|
|
|
+ "Correct error message found");
|
|
|
+ ok(message.text.includes("expired.example.com"), "URL found in error message");
|
|
|
+ ok(message.systemDate.includes(localDateFmt), "correct local date displayed");
|
|
|
+ ok(message.actualDate.includes(serverDateFmt), "correct server date displayed");
|
|
|
+ ok(message.learnMoreLink.includes("time-errors"), "time-errors in the Learn More URL");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ // pretend we have a negatively skewed (behind) system time
|
|
|
+ serverDate = new Date();
|
|
|
+ serverDate.setYear(serverDate.getFullYear() + 1);
|
|
|
+ serverDateFmt = formatter.format(serverDate);
|
|
|
+
|
|
|
+ skew = Math.floor((Date.now() - serverDate.getTime()) / 1000);
|
|
|
+ await SpecialPowers.pushPrefEnv({set: [[PREF_BLOCKLIST_CLOCK_SKEW_SECONDS, skew]]});
|
|
|
+@@ -189,39 +189,39 @@ add_task(async function checkWrongSystem
|
|
|
+
|
|
|
+ isnot(message.divDisplay, "none", "Wrong time message information is visible");
|
|
|
+ ok(message.text.includes("clock appears to show the wrong time"),
|
|
|
+ "Correct error message found");
|
|
|
+ ok(message.text.includes("expired.example.com"), "URL found in error message");
|
|
|
+ ok(message.systemDate.includes(localDateFmt), "correct local date displayed");
|
|
|
+ ok(message.actualDate.includes(serverDateFmt), "correct server date displayed");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ // pretend we only have a slightly skewed system time, four hours
|
|
|
+ skew = 60 * 60 * 4;
|
|
|
+ await SpecialPowers.pushPrefEnv({set: [[PREF_BLOCKLIST_CLOCK_SKEW_SECONDS, skew]]});
|
|
|
+
|
|
|
+ info("Loading a bad cert page with an only slightly skewed clock");
|
|
|
+ message = await setUpPage();
|
|
|
+
|
|
|
+ is(message.divDisplay, "none", "Wrong time message information is not visible");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ // now pretend we have no skewed system time
|
|
|
+ skew = 0;
|
|
|
+ await SpecialPowers.pushPrefEnv({set: [[PREF_BLOCKLIST_CLOCK_SKEW_SECONDS, skew]]});
|
|
|
+
|
|
|
+ info("Loading a bad cert page with no skewed clock");
|
|
|
+ message = await setUpPage();
|
|
|
+
|
|
|
+ is(message.divDisplay, "none", "Wrong time message information is not visible");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function checkAdvancedDetails() {
|
|
|
+ info("Loading a bad cert page and verifying the main error and advanced details section");
|
|
|
+ let browser;
|
|
|
+ let certErrorLoaded;
|
|
|
+ await BrowserTestUtils.openNewForegroundTab(gBrowser, () => {
|
|
|
+ gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, BAD_CERT);
|
|
|
+@@ -273,17 +273,17 @@ add_task(async function checkAdvancedDet
|
|
|
+ "Correct error message found");
|
|
|
+ ok(message.text.includes("HTTP Strict Transport Security: false"),
|
|
|
+ "Correct HSTS value found");
|
|
|
+ ok(message.text.includes("HTTP Public Key Pinning: false"),
|
|
|
+ "Correct HPKP value found");
|
|
|
+ let certChain = getCertChain(message.securityInfoAsString);
|
|
|
+ ok(message.text.includes(certChain), "Found certificate chain");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function checkAdvancedDetailsForHSTS() {
|
|
|
+ info("Loading a bad STS cert page and verifying the advanced details section");
|
|
|
+ let browser;
|
|
|
+ let certErrorLoaded;
|
|
|
+ await BrowserTestUtils.openNewForegroundTab(gBrowser, () => {
|
|
|
+ gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, BAD_STS_CERT);
|
|
|
+@@ -342,17 +342,17 @@ add_task(async function checkAdvancedDet
|
|
|
+ "Correct error message found");
|
|
|
+ ok(message.text.includes("HTTP Strict Transport Security: false"),
|
|
|
+ "Correct HSTS value found");
|
|
|
+ ok(message.text.includes("HTTP Public Key Pinning: true"),
|
|
|
+ "Correct HPKP value found");
|
|
|
+ let certChain = getCertChain(message.securityInfoAsString);
|
|
|
+ ok(message.text.includes(certChain), "Found certificate chain");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function checkUnknownIssuerLearnMoreLink() {
|
|
|
+ info("Loading a cert error for self-signed pages and checking the correct link is shown");
|
|
|
+ let browser;
|
|
|
+ let certErrorLoaded;
|
|
|
+ await BrowserTestUtils.openNewForegroundTab(gBrowser, () => {
|
|
|
+ gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, UNKNOWN_ISSUER);
|
|
|
+@@ -364,17 +364,17 @@ add_task(async function checkUnknownIssu
|
|
|
+ await certErrorLoaded;
|
|
|
+
|
|
|
+ let href = await ContentTask.spawn(browser, null, async function() {
|
|
|
+ let learnMoreLink = content.document.getElementById("learnMoreLink");
|
|
|
+ return learnMoreLink.href;
|
|
|
+ });
|
|
|
+ ok(href.endsWith("security-error"), "security-error in the Learn More URL");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ function getCertChain(securityInfoAsString) {
|
|
|
+ let certChain = "";
|
|
|
+ const serhelper = Cc["@mozilla.org/network/serialization-helper;1"]
|
|
|
+ .getService(Ci.nsISerializationHelper);
|
|
|
+ let securityInfo = serhelper.deserializeObject(securityInfoAsString);
|
|
|
+ securityInfo.QueryInterface(Ci.nsITransportSecurityInfo);
|
|
|
+diff --git a/browser/base/content/test/about/browser_aboutNetError.js b/browser/base/content/test/about/browser_aboutNetError.js
|
|
|
+--- a/browser/base/content/test/about/browser_aboutNetError.js
|
|
|
++++ b/browser/base/content/test/about/browser_aboutNetError.js
|
|
|
+@@ -38,10 +38,10 @@ add_task(async function checkReturnToPre
|
|
|
+ is(prefResetButton.getAttribute("autofocus"), "true", "prefResetButton has autofocus");
|
|
|
+ prefResetButton.click();
|
|
|
+
|
|
|
+ await ContentTaskUtils.waitForEvent(this, "pageshow", true);
|
|
|
+
|
|
|
+ is(content.document.documentURI, LOW_TLS_VERSION_, "Should not be showing page");
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/about/browser_aboutStopReload.js b/browser/base/content/test/about/browser_aboutStopReload.js
|
|
|
+--- a/browser/base/content/test/about/browser_aboutStopReload.js
|
|
|
++++ b/browser/base/content/test/about/browser_aboutStopReload.js
|
|
|
+@@ -15,49 +15,49 @@ add_task(async function checkDontShowSto
|
|
|
+ let stopReloadContainer = document.getElementById("stop-reload-button");
|
|
|
+ let stopReloadContainerObserver = new MutationObserver(stopReloadMutationCallback);
|
|
|
+
|
|
|
+ await waitForNoAnimation(stopReloadContainer);
|
|
|
+ stopReloadContainerObserver.observe(stopReloadContainer, { attributeFilter: ["animate"]});
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab({gBrowser,
|
|
|
+ opening: "about:robots",
|
|
|
+ waitForStateStop: true});
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ Assert.ok(true, "Test finished: stop-reload does not animate when navigating to local URI on new tab");
|
|
|
+ stopReloadContainerObserver.disconnect();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function checkDontShowStopFromLocalURI() {
|
|
|
+ let stopReloadContainer = document.getElementById("stop-reload-button");
|
|
|
+ let stopReloadContainerObserver = new MutationObserver(stopReloadMutationCallback);
|
|
|
+
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab({gBrowser,
|
|
|
+ opening: "about:robots",
|
|
|
+ waitForStateStop: true});
|
|
|
+ await waitForNoAnimation(stopReloadContainer);
|
|
|
+ stopReloadContainerObserver.observe(stopReloadContainer, { attributeFilter: ["animate"]});
|
|
|
+ await BrowserTestUtils.loadURI(tab.linkedBrowser, "about:mozilla");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ Assert.ok(true, "Test finished: stop-reload does not animate when navigating between local URIs");
|
|
|
+ stopReloadContainerObserver.disconnect();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function checkDontShowStopFromNonLocalURI() {
|
|
|
+ let stopReloadContainer = document.getElementById("stop-reload-button");
|
|
|
+ let stopReloadContainerObserver = new MutationObserver(stopReloadMutationCallback);
|
|
|
+
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab({gBrowser,
|
|
|
+ opening: "https://example.com",
|
|
|
+ waitForStateStop: true});
|
|
|
+ await waitForNoAnimation(stopReloadContainer);
|
|
|
+ stopReloadContainerObserver.observe(stopReloadContainer, { attributeFilter: ["animate"]});
|
|
|
+ await BrowserTestUtils.loadURI(tab.linkedBrowser, "about:mozilla");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ Assert.ok(true, "Test finished: stop-reload does not animate when navigating to local URI from non-local URI");
|
|
|
+ stopReloadContainerObserver.disconnect();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function checkDoShowStopOnNewTab() {
|
|
|
+ let stopReloadContainer = document.getElementById("stop-reload-button");
|
|
|
+ let animatePromise = getAnimatePromise(stopReloadContainer);
|
|
|
+diff --git a/browser/base/content/test/about/browser_aboutStopReload.js.1442465-4_2.later b/browser/base/content/test/about/browser_aboutStopReload.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/about/browser_aboutStopReload.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,54 @@
|
|
|
++--- browser_aboutStopReload.js
|
|
|
+++++ browser_aboutStopReload.js
|
|
|
++@@ -65,17 +65,17 @@ add_task(async function checkDoShowStopO
|
|
|
++
|
|
|
++ await waitForNoAnimation(stopReloadContainer);
|
|
|
++
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab({gBrowser,
|
|
|
++ opening: "https://example.com",
|
|
|
++ waitForStateStop: true});
|
|
|
++ await stopPromise;
|
|
|
++ await waitForNoAnimation(stopReloadContainer);
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++
|
|
|
++ info("Test finished: stop-reload shows stop when navigating to non-local URI during tab opening");
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function checkAnimateStopOnTabAfterTabFinishesOpening() {
|
|
|
++ let stopReloadContainer = document.getElementById("stop-reload-button");
|
|
|
++
|
|
|
++ await waitForNoAnimation(stopReloadContainer);
|
|
|
++@@ -83,17 +83,17 @@ add_task(async function checkAnimateStop
|
|
|
++ waitForStateStop: true});
|
|
|
++ await BrowserTestUtils.waitForCondition(() => {
|
|
|
++ info("Waiting for tabAnimationsInProgress to equal 0, currently " + gBrowser.tabAnimationsInProgress);
|
|
|
++ return !gBrowser.tabAnimationsInProgress;
|
|
|
++ });
|
|
|
++ let animatePromise = getAnimatePromise(stopReloadContainer);
|
|
|
++ await BrowserTestUtils.loadURI(tab.linkedBrowser, "https://example.com");
|
|
|
++ await animatePromise;
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++
|
|
|
++ info("Test finished: stop-reload animates when navigating to non-local URI on new tab after tab has opened");
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function checkDoShowStopFromLocalURI() {
|
|
|
++ let stopReloadContainer = document.getElementById("stop-reload-button");
|
|
|
++
|
|
|
++ await waitForNoAnimation(stopReloadContainer);
|
|
|
++@@ -103,12 +103,12 @@ add_task(async function checkDoShowStopF
|
|
|
++ await BrowserTestUtils.waitForCondition(() => {
|
|
|
++ info("Waiting for tabAnimationsInProgress to equal 0, currently " + gBrowser.tabAnimationsInProgress);
|
|
|
++ return !gBrowser.tabAnimationsInProgress;
|
|
|
++ });
|
|
|
++ let animatePromise = getAnimatePromise(stopReloadContainer);
|
|
|
++ await BrowserTestUtils.loadURI(tab.linkedBrowser, "https://example.com");
|
|
|
++ await animatePromise;
|
|
|
++ await waitForNoAnimation(stopReloadContainer);
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++
|
|
|
++ info("Test finished: stop-reload animates when navigating to non-local URI from local URI");
|
|
|
++ });
|
|
|
+diff --git a/browser/base/content/test/alerts/browser_notification_open_settings.js b/browser/base/content/test/alerts/browser_notification_open_settings.js
|
|
|
+--- a/browser/base/content/test/alerts/browser_notification_open_settings.js
|
|
|
++++ b/browser/base/content/test/alerts/browser_notification_open_settings.js
|
|
|
+@@ -22,17 +22,17 @@ add_task(async function test_settingsOpe
|
|
|
+ let tabPromise = BrowserTestUtils.waitForNewTab(gBrowser, expectedURL);
|
|
|
+ info("simulate a notifications-open-settings notification");
|
|
|
+ let uri = NetUtil.newURI("https://example.com");
|
|
|
+ let principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
|
|
|
+ Services.obs.notifyObservers(principal, "notifications-open-settings");
|
|
|
+ let tab = await tabPromise;
|
|
|
+ ok(tab, "The notification settings tab opened");
|
|
|
+ await syncPaneLoadedPromise;
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_settingsOpen_button() {
|
|
|
+ let pm = Services.perms;
|
|
|
+ info("Adding notification permission");
|
|
|
+ pm.add(makeURI(notificationURL), "desktop-notification", pm.ALLOW_ACTION);
|
|
|
+
|
|
|
+@@ -64,15 +64,15 @@ add_task(async function test_settingsOpe
|
|
|
+ openSettingsMenuItem.click();
|
|
|
+
|
|
|
+ info("Waiting for notification settings tab");
|
|
|
+ let tab = await tabPromise;
|
|
|
+ ok(tab, "The notification settings tab opened");
|
|
|
+
|
|
|
+ await syncPaneLoadedPromise;
|
|
|
+ await closePromise;
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ } finally {
|
|
|
+ info("Removing notification permission");
|
|
|
+ pm.remove(makeURI(notificationURL), "desktop-notification");
|
|
|
+ }
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/captivePortal/browser_CaptivePortalWatcher_1.js b/browser/base/content/test/captivePortal/browser_CaptivePortalWatcher_1.js
|
|
|
+--- a/browser/base/content/test/captivePortal/browser_CaptivePortalWatcher_1.js
|
|
|
++++ b/browser/base/content/test/captivePortal/browser_CaptivePortalWatcher_1.js
|
|
|
+@@ -51,39 +51,39 @@ let testcases = [
|
|
|
+ }
|
|
|
+
|
|
|
+ // Simulate clicking the button. The portal tab should be opened and
|
|
|
+ // selected and the button should hide.
|
|
|
+ let tab = await clickButtonAndExpectNewPortalTab();
|
|
|
+ testPortalTabSelectedAndButtonNotVisible();
|
|
|
+
|
|
|
+ // Close the tab. The button should become visible.
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ ensureNoPortalTab(win);
|
|
|
+ testShowLoginPageButtonVisibility(notification, "visible");
|
|
|
+
|
|
|
+ // When the button is clicked, a new portal tab should be opened and
|
|
|
+ // selected.
|
|
|
+ tab = await clickButtonAndExpectNewPortalTab();
|
|
|
+
|
|
|
+ // Open another arbitrary tab. The button should become visible. When it's clicked,
|
|
|
+ // the portal tab should be selected.
|
|
|
+ let anotherTab = await BrowserTestUtils.openNewForegroundTab(win.gBrowser);
|
|
|
+ testShowLoginPageButtonVisibility(notification, "visible");
|
|
|
+ button.click();
|
|
|
+ is(win.gBrowser.selectedTab, tab, "The captive portal tab should be selected.");
|
|
|
+
|
|
|
+ // Close the portal tab and select the arbitrary tab. The button should become
|
|
|
+ // visible and when it's clicked, a new portal tab should be opened.
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ win.gBrowser.selectedTab = anotherTab;
|
|
|
+ testShowLoginPageButtonVisibility(notification, "visible");
|
|
|
+ tab = await clickButtonAndExpectNewPortalTab();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(anotherTab);
|
|
|
++ BrowserTestUtils.removeTab(anotherTab);
|
|
|
+ await freePortal(true);
|
|
|
+ ensureNoPortalTab(win);
|
|
|
+ ensureNoPortalNotification(win);
|
|
|
+ await closeWindowAndWaitForXulWindowVisible(win);
|
|
|
+ },
|
|
|
+ ];
|
|
|
+
|
|
|
+ for (let testcase of testcases) {
|
|
|
+diff --git a/browser/base/content/test/captivePortal/browser_captivePortal_certErrorUI.js b/browser/base/content/test/captivePortal/browser_captivePortal_certErrorUI.js
|
|
|
+--- a/browser/base/content/test/captivePortal/browser_captivePortal_certErrorUI.js
|
|
|
++++ b/browser/base/content/test/captivePortal/browser_captivePortal_certErrorUI.js
|
|
|
+@@ -73,10 +73,10 @@ add_task(async function checkCaptivePort
|
|
|
+ info("Waiting for error tab to be reloaded after the captive portal was freed.");
|
|
|
+ await errorTabReloaded;
|
|
|
+ await ContentTask.spawn(browser, null, () => {
|
|
|
+ let doc = content.document;
|
|
|
+ ok(!doc.body.classList.contains("captiveportal"),
|
|
|
+ "Captive portal error page UI is not visible.");
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(errorTab);
|
|
|
++ BrowserTestUtils.removeTab(errorTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/contextMenu/browser_contextmenu_linkopen.js.1442465-4_2.later b/browser/base/content/test/contextMenu/browser_contextmenu_linkopen.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/contextMenu/browser_contextmenu_linkopen.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,14 @@
|
|
|
++--- browser_contextmenu_linkopen.js
|
|
|
+++++ browser_contextmenu_linkopen.js
|
|
|
++@@ -60,10 +60,10 @@ async function activateContextAndWaitFor
|
|
|
++
|
|
|
++ add_task(async function test_select_text_link() {
|
|
|
++ let testTab = await BrowserTestUtils.openNewForegroundTab(gBrowser, RESOURCE_LINK);
|
|
|
++ for (let elementID of ["test-link", "test-image-link", "svg-with-link", "svg-with-relative-link"]) {
|
|
|
++ for (let where of ["tab", "window", "privatewindow"]) {
|
|
|
++ await activateContextAndWaitFor("#" + elementID, where);
|
|
|
++ }
|
|
|
++ }
|
|
|
++- await BrowserTestUtils.removeTab(testTab);
|
|
|
+++ BrowserTestUtils.removeTab(testTab);
|
|
|
++ });
|
|
|
+diff --git a/browser/base/content/test/favicons/browser_favicon_load.js.1442465-4_2.later b/browser/base/content/test/favicons/browser_favicon_load.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/favicons/browser_favicon_load.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_favicon_load.js
|
|
|
+++++ browser_favicon_load.js
|
|
|
++@@ -125,17 +125,17 @@ async function doTest(aTestPage, aFavico
|
|
|
++ // Open the tab.
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, aTestPage);
|
|
|
++ // Waiting for favicon requests are all made.
|
|
|
++ await observer.promise;
|
|
|
++ // Waiting for favicon loaded.
|
|
|
++ await promiseWaitOnFaviconLoaded;
|
|
|
++
|
|
|
++ // Close the tab.
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ }
|
|
|
++
|
|
|
++ async function setupTailingPreference(aTailingEnabled) {
|
|
|
++ await SpecialPowers.pushPrefEnv({"set": [
|
|
|
++ ["network.http.tailing.enabled", aTailingEnabled]
|
|
|
++ ]});
|
|
|
++ }
|
|
|
++
|
|
|
+diff --git a/browser/base/content/test/favicons/browser_multiple_icons_in_short_timeframe.js.1442465-4_2.later b/browser/base/content/test/favicons/browser_multiple_icons_in_short_timeframe.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/favicons/browser_multiple_icons_in_short_timeframe.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,14 @@
|
|
|
++--- browser_multiple_icons_in_short_timeframe.js
|
|
|
+++++ browser_multiple_icons_in_short_timeframe.js
|
|
|
++@@ -31,10 +31,10 @@ add_task(async function() {
|
|
|
++ head.appendChild(link2);
|
|
|
++ });
|
|
|
++
|
|
|
++ await promiseIcon;
|
|
|
++ // The test must have at least one pass.
|
|
|
++ Assert.equal(gBrowser.getIcon(), ROOT + "two.png",
|
|
|
++ "The expected icon has been set");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/base/content/test/favicons/browser_preferred_icons.js.1442465-4_2.later b/browser/base/content/test/favicons/browser_preferred_icons.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/favicons/browser_preferred_icons.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_preferred_icons.js
|
|
|
+++++ browser_preferred_icons.js
|
|
|
++@@ -35,17 +35,17 @@ function createLinks(linkInfos) {
|
|
|
++ }
|
|
|
++ });
|
|
|
++ }
|
|
|
++
|
|
|
++ add_task(async function setup() {
|
|
|
++ const URL = ROOT + "discovery.html";
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, URL);
|
|
|
++ registerCleanupFunction(async function() {
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function prefer_svg() {
|
|
|
++ let promise = waitIcon(ROOT + "icon.svg");
|
|
|
++ await createLinks([
|
|
|
++ { href: ROOT + "icon.ico",
|
|
|
++ type: "image/x-icon"
|
|
|
+diff --git a/browser/base/content/test/favicons/browser_rich_icons.js.1442465-4_2.later b/browser/base/content/test/favicons/browser_rich_icons.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/favicons/browser_rich_icons.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,33 @@
|
|
|
++--- browser_rich_icons.js
|
|
|
+++++ browser_rich_icons.js
|
|
|
++@@ -42,17 +42,17 @@ add_task(async function test_richIcons()
|
|
|
++ // Because there is debounce logic in ContentLinkHandler.jsm to reduce the
|
|
|
++ // favicon loads, we have to wait some time before checking that icon was
|
|
|
++ // stored properly.
|
|
|
++ await BrowserTestUtils.waitForCondition(() => {
|
|
|
++ tabIconUri = gBrowser.getIcon();
|
|
|
++ return tabIconUri != null;
|
|
|
++ }, "wait for icon load to finish", 100, 20);
|
|
|
++ is(tabIconUri, EXPECTED_ICON, "should use the non-rich icon for the tab");
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function test_maskIcons() {
|
|
|
++ const URL = ROOT + "file_mask_icon.html";
|
|
|
++ // First we need to clear the failed favicons cache, since previous tests
|
|
|
++ // likely added this non-existing icon, and useDefaultIcon would skip it.
|
|
|
++ PlacesUtils.favicons.removeFailedFavicon(makeURI("http://mochi.test:8888/favicon.ico"));
|
|
|
++ const EXPECTED_ICON = "http://mochi.test:8888/favicon.ico";
|
|
|
++@@ -60,10 +60,10 @@ add_task(async function test_maskIcons()
|
|
|
++
|
|
|
++ const tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, URL);
|
|
|
++
|
|
|
++ await BrowserTestUtils.waitForCondition(() => {
|
|
|
++ tabIconUri = gBrowser.getIcon();
|
|
|
++ return tabIconUri != null;
|
|
|
++ }, "wait for icon load to finish", 100, 20);
|
|
|
++ is(tabIconUri, EXPECTED_ICON, "should ignore the mask icons and load the root favicon");
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/base/content/test/forms/browser_selectpopup.js b/browser/base/content/test/forms/browser_selectpopup.js
|
|
|
+--- a/browser/base/content/test/forms/browser_selectpopup.js
|
|
|
++++ b/browser/base/content/test/forms/browser_selectpopup.js
|
|
|
+@@ -214,17 +214,17 @@ async function doSelectTests(contentType
|
|
|
+ EventUtils.synthesizeKey("KEY_Tab", {shiftKey: true});
|
|
|
+ is((await getInputEvents()), isWindows ? 2 : 1, "Tab away from select with change - number of input events");
|
|
|
+ is((await getChangeEvents()), isWindows ? 2 : 1, "Tab away from select with change - number of change events");
|
|
|
+ is((await getClickEvents()), 2, "Tab away from select with change - number of click events");
|
|
|
+
|
|
|
+ is(selectPopup.lastChild.previousSibling.label, "Seven", "Spaces collapsed");
|
|
|
+ is(selectPopup.lastChild.label, "\xA0\xA0Eight\xA0\xA0", "Non-breaking spaces not collapsed");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function setup() {
|
|
|
+ await SpecialPowers.pushPrefEnv({
|
|
|
+ "set": [
|
|
|
+ ["dom.select_popup_in_parent.enabled", true],
|
|
|
+ ["dom.forms.select.customstyling", true]
|
|
|
+ ]
|
|
|
+@@ -276,17 +276,17 @@ add_task(async function() {
|
|
|
+ await popupHiddenPromise;
|
|
|
+
|
|
|
+ ok(true, "Popup hidden when select is removed");
|
|
|
+
|
|
|
+ // Finally, try it when the tab is closed while the select popup is open.
|
|
|
+ await openSelectPopup(selectPopup, "click", "#one");
|
|
|
+
|
|
|
+ popupHiddenPromise = BrowserTestUtils.waitForEvent(selectPopup, "popuphidden");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await popupHiddenPromise;
|
|
|
+
|
|
|
+ ok(true, "Popup hidden when tab is closed");
|
|
|
+ });
|
|
|
+
|
|
|
+ // This test opens a select popup that is isn't a frame and has some translations applied.
|
|
|
+ add_task(async function() {
|
|
|
+ const pageUrl = "data:text/html," + escape(PAGECONTENT_TRANSLATED);
|
|
|
+@@ -343,17 +343,17 @@ add_task(async function() {
|
|
|
+
|
|
|
+ let popupRect = selectPopup.getBoundingClientRect();
|
|
|
+ is(popupRect.left, expectedX, "step " + (stepIndex + 1) + " x");
|
|
|
+ is(popupRect.top, expectedY, "step " + (stepIndex + 1) + " y");
|
|
|
+
|
|
|
+ await hideSelectPopup(selectPopup);
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test that we get the right events when a select popup is changed.
|
|
|
+ add_task(async function test_event_order() {
|
|
|
+ const URL = "data:text/html," + escape(PAGECONTENT_SMALL);
|
|
|
+ await BrowserTestUtils.withNewTab({
|
|
|
+ gBrowser,
|
|
|
+ url: URL,
|
|
|
+@@ -580,17 +580,17 @@ async function performLargePopupTests(wi
|
|
|
+ // This test checks select elements with a large number of options to ensure that
|
|
|
+ // the popup appears within the browser area.
|
|
|
+ add_task(async function test_large_popup() {
|
|
|
+ const pageUrl = "data:text/html," + escape(PAGECONTENT_SMALL);
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, pageUrl);
|
|
|
+
|
|
|
+ await performLargePopupTests(window);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // This test checks the same as the previous test but in a new smaller window.
|
|
|
+ add_task(async function test_large_popup_in_small_window() {
|
|
|
+ let newwin = await BrowserTestUtils.openNewBrowserWindow({ width: 400, height: 400 });
|
|
|
+
|
|
|
+ const pageUrl = "data:text/html," + escape(PAGECONTENT_SMALL);
|
|
|
+ let browserLoadedPromise = BrowserTestUtils.browserLoaded(newwin.gBrowser.selectedBrowser);
|
|
|
+@@ -666,17 +666,17 @@ add_task(async function test_select_sear
|
|
|
+ ["dom.forms.selectSearch", true],
|
|
|
+ ],
|
|
|
+ });
|
|
|
+ const pageUrl = "data:text/html," + escape(PAGECONTENT_GROUPS);
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, pageUrl);
|
|
|
+
|
|
|
+ await performSelectSearchTests(window);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ await SpecialPowers.popPrefEnv();
|
|
|
+ });
|
|
|
+
|
|
|
+ // This test checks that a mousemove event is fired correctly at the menu and
|
|
|
+ // not at the browser, ensuring that any mouse capture has been cleared.
|
|
|
+ add_task(async function test_mousemove_correcttarget() {
|
|
|
+ const pageUrl = "data:text/html," + escape(PAGECONTENT_SMALL);
|
|
|
+@@ -706,17 +706,17 @@ add_task(async function test_mousemove_c
|
|
|
+ await openSelectPopup(selectPopup, "click");
|
|
|
+ let popupHiddenPromise = BrowserTestUtils.waitForEvent(selectPopup, "popuphidden");
|
|
|
+ let sizeModeChanged = BrowserTestUtils.waitForEvent(window, "sizemodechange");
|
|
|
+ BrowserFullScreen();
|
|
|
+ await sizeModeChanged;
|
|
|
+ await popupHiddenPromise;
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // This test checks when a <select> element has some options with altered display values.
|
|
|
+ add_task(async function test_somehidden() {
|
|
|
+ const pageUrl = "data:text/html," + escape(PAGECONTENT_SOMEHIDDEN);
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, pageUrl);
|
|
|
+
|
|
|
+ let selectPopup = document.getElementById("ContentSelectDropdown").menupopup;
|
|
|
+@@ -736,17 +736,17 @@ add_task(async function test_somehidden(
|
|
|
+ let idx = 1;
|
|
|
+ while (child) {
|
|
|
+ is(getComputedStyle(child).display, child.label.indexOf("Visible") > 0 ? "-moz-box" : "none",
|
|
|
+ "Item " + (idx++) + " is visible");
|
|
|
+ child = child.nextSibling;
|
|
|
+ }
|
|
|
+
|
|
|
+ await hideSelectPopup(selectPopup, "escape");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // This test checks that the popup is closed when the select element is blurred.
|
|
|
+ add_task(async function test_blur_hides_popup() {
|
|
|
+ const pageUrl = "data:text/html," + escape(PAGECONTENT_SMALL);
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, pageUrl);
|
|
|
+
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, null, async function() {
|
|
|
+@@ -768,10 +768,10 @@ add_task(async function test_blur_hides_
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, null, async function() {
|
|
|
+ content.document.getElementById("one").blur();
|
|
|
+ });
|
|
|
+
|
|
|
+ await popupHiddenPromise;
|
|
|
+
|
|
|
+ ok(true, "Blur closed popup");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/forms/browser_selectpopup_colors.js b/browser/base/content/test/forms/browser_selectpopup_colors.js
|
|
|
+--- a/browser/base/content/test/forms/browser_selectpopup_colors.js
|
|
|
++++ b/browser/base/content/test/forms/browser_selectpopup_colors.js
|
|
|
+@@ -289,17 +289,17 @@ async function testSelectColors(select,
|
|
|
+ while (child) {
|
|
|
+ testOptionColors(idx, child, menulist);
|
|
|
+ idx++;
|
|
|
+ child = child.nextSibling;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!options.leaveOpen) {
|
|
|
+ await hideSelectPopup(selectPopup, "escape");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function setup() {
|
|
|
+ await SpecialPowers.pushPrefEnv({
|
|
|
+ "set": [
|
|
|
+ ["dom.select_popup_in_parent.enabled", true],
|
|
|
+ ["dom.forms.select.customstyling", true]
|
|
|
+@@ -478,17 +478,17 @@ add_task(async function test_select_with
|
|
|
+
|
|
|
+ let menulist = document.getElementById("ContentSelectDropdown");
|
|
|
+ let selectPopup = menulist.menupopup;
|
|
|
+ let scrollBox = selectPopup.scrollBox;
|
|
|
+ is(scrollBox.scrollTop, scrollBox.scrollTopMax,
|
|
|
+ "The popup should be scrolled to the bottom of the list (where the selected item is)");
|
|
|
+
|
|
|
+ await hideSelectPopup(selectPopup, "escape");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_select_inherited_colors_on_options_dont_get_unique_rules_if_rule_set_on_select() {
|
|
|
+ let options = {
|
|
|
+ selectColor: "rgb(0, 0, 255)",
|
|
|
+ selectBgColor: "rgb(255, 255, 255)",
|
|
|
+ selectTextShadow: "rgb(0, 0, 255) 1px 1px 2px",
|
|
|
+ leaveOpen: true
|
|
|
+@@ -523,10 +523,10 @@ add_task(async function test_select_inhe
|
|
|
+ "text-shadow": "rgb(0, 0, 0) 1px 1px 2px"
|
|
|
+ }), true, "There should be a rule specific to option3 and it should have text-shadow: rgb(0, 0, 0) 1px 1px 2px");
|
|
|
+
|
|
|
+
|
|
|
+ let menulist = document.getElementById("ContentSelectDropdown");
|
|
|
+ let selectPopup = menulist.menupopup;
|
|
|
+
|
|
|
+ await hideSelectPopup(selectPopup, "escape");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/forms/browser_selectpopup_searchfocus.js b/browser/base/content/test/forms/browser_selectpopup_searchfocus.js
|
|
|
+--- a/browser/base/content/test/forms/browser_selectpopup_searchfocus.js
|
|
|
++++ b/browser/base/content/test/forms/browser_selectpopup_searchfocus.js
|
|
|
+@@ -32,11 +32,11 @@ add_task(async function test_focus_on_se
|
|
|
+ searchInput.scrollIntoView();
|
|
|
+ let searchFocused = BrowserTestUtils.waitForEvent(searchInput, "focus");
|
|
|
+ await EventUtils.synthesizeMouseAtCenter(searchInput, {}, window);
|
|
|
+ await searchFocused;
|
|
|
+
|
|
|
+ is(selectPopup.state, "open", "select popup should still be open after clicking on the search field");
|
|
|
+
|
|
|
+ await hideSelectPopup(selectPopup, "escape");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/base/content/test/general/browser_addCertException.js b/browser/base/content/test/general/browser_addCertException.js
|
|
|
+--- a/browser/base/content/test/general/browser_addCertException.js
|
|
|
++++ b/browser/base/content/test/general/browser_addCertException.js
|
|
|
+@@ -11,17 +11,17 @@
|
|
|
+ // the site, including showing the right identity box and control center icons.
|
|
|
+ add_task(async function() {
|
|
|
+ await BrowserTestUtils.openNewForegroundTab(gBrowser);
|
|
|
+ await loadBadCertPage("https://expired.example.com");
|
|
|
+ checkControlPanelIcons();
|
|
|
+ let certOverrideService = Cc["@mozilla.org/security/certoverride;1"]
|
|
|
+ .getService(Ci.nsICertOverrideService);
|
|
|
+ certOverrideService.clearValidityOverride("expired.example.com", -1);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Check for the correct icons in the identity box and control center.
|
|
|
+ function checkControlPanelIcons() {
|
|
|
+ let { gIdentityHandler } = gBrowser.ownerGlobal;
|
|
|
+ gIdentityHandler._identityBox.click();
|
|
|
+ document.getElementById("identity-popup-security-expander").click();
|
|
|
+
|
|
|
+diff --git a/browser/base/content/test/general/browser_addKeywordSearch.js b/browser/base/content/test/general/browser_addKeywordSearch.js
|
|
|
+--- a/browser/base/content/test/general/browser_addKeywordSearch.js
|
|
|
++++ b/browser/base/content/test/general/browser_addKeywordSearch.js
|
|
|
+@@ -72,10 +72,10 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ let popupHiddenPromise = BrowserTestUtils.waitForEvent(contextMenu, "popuphidden");
|
|
|
+ contextMenu.hidePopup();
|
|
|
+ await popupHiddenPromise;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_bookmark_titles.js b/browser/base/content/test/general/browser_bookmark_titles.js
|
|
|
+--- a/browser/base/content/test/general/browser_bookmark_titles.js
|
|
|
++++ b/browser/base/content/test/general/browser_bookmark_titles.js
|
|
|
+@@ -62,17 +62,17 @@ add_task(async function() {
|
|
|
+
|
|
|
+ // The offline mode test is only good if the page failed to load.
|
|
|
+ await ContentTask.spawn(browser, null, function() {
|
|
|
+ Assert.equal(content.document.documentURI.substring(0, 14), "about:neterror",
|
|
|
+ "Offline mode successfully simulated network outage.");
|
|
|
+ });
|
|
|
+ await checkBookmark(url, title);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Bookmark the current page and confirm that the new bookmark has the expected
|
|
|
+ // title. (Then delete the bookmark.)
|
|
|
+ async function checkBookmark(url, expected_title) {
|
|
|
+ Assert.equal(gBrowser.selectedBrowser.currentURI.spec, url,
|
|
|
+ "Trying to bookmark the expected uri");
|
|
|
+
|
|
|
+diff --git a/browser/base/content/test/general/browser_bookmark_titles.js.1442465-4_2.later b/browser/base/content/test/general/browser_bookmark_titles.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/general/browser_bookmark_titles.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_bookmark_titles.js
|
|
|
+++++ browser_bookmark_titles.js
|
|
|
++@@ -80,17 +80,17 @@ add_task(async function check_override_b
|
|
|
++ let promiseLoaded = promisePageLoaded(browser);
|
|
|
++ BrowserTestUtils.loadURI(browser, url);
|
|
|
++
|
|
|
++ await promiseLoaded;
|
|
|
++
|
|
|
++ // Test that a bookmark of this URI gets the correct title if we provide one
|
|
|
++ await checkBookmarkedPageTitle(url, default_title, "An overridden title");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ // Bookmark a page and confirm that the new bookmark has the expected title.
|
|
|
++ // (Then delete the bookmark.)
|
|
|
++ async function checkBookmarkedPageTitle(url, default_title, overridden_title) {
|
|
|
++ let promiseBookmark = PlacesTestUtils.waitForNotification("onItemAdded",
|
|
|
++ (id, parentId, index, type, itemUrl) => itemUrl.equals(Services.io.newURI(url)));
|
|
|
++
|
|
|
+diff --git a/browser/base/content/test/general/browser_bug1261299.js b/browser/base/content/test/general/browser_bug1261299.js
|
|
|
+--- a/browser/base/content/test/general/browser_bug1261299.js
|
|
|
++++ b/browser/base/content/test/general/browser_bug1261299.js
|
|
|
+@@ -25,17 +25,17 @@ add_task(async function test_content_and
|
|
|
+
|
|
|
+ gURLBar.value = "test.mozilla.org";
|
|
|
+ await gURLBar.focus();
|
|
|
+ await BrowserTestUtils.synthesizeKey("KEY_ArrowRight",
|
|
|
+ {shiftKey: true, ctrlKey: true}, gBrowser.selectedBrowser);
|
|
|
+ selectedText = DOMWindowUtils.GetSelectionAsPlaintext();
|
|
|
+ is(selectedText, "test.mozilla.org", "The macOS services got the selected chrome text");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test switching active selection.
|
|
|
+ // Each tab has a content selection and when you switch to that tab, its selection becomes
|
|
|
+ // active aka the current selection.
|
|
|
+ // Expect: The active selection is what is being sent to OSX service menu.
|
|
|
+
|
|
|
+ add_task(async function test_active_selection_switches_properly() {
|
|
|
+@@ -61,11 +61,11 @@ add_task(async function test_active_sele
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, tab1);
|
|
|
+ selectedText = DOMWindowUtils.GetSelectionAsPlaintext();
|
|
|
+ is(selectedText, "Write something here", "The macOS services got the selected content text");
|
|
|
+
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, tab2);
|
|
|
+ selectedText = DOMWindowUtils.GetSelectionAsPlaintext();
|
|
|
+ is(selectedText, "Nothing available", "The macOS services got the selected content text");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_bug1299667.js b/browser/base/content/test/general/browser_bug1299667.js
|
|
|
+--- a/browser/base/content/test/general/browser_bug1299667.js
|
|
|
++++ b/browser/base/content/test/general/browser_bug1299667.js
|
|
|
+@@ -40,12 +40,12 @@ add_task(async function() {
|
|
|
+ is(node.getAttribute("historyindex"), "-1", "second item historyindex");
|
|
|
+
|
|
|
+ let popupHiddenPromise = BrowserTestUtils.waitForEvent(contextMenu, "popuphidden");
|
|
|
+ event.target.hidePopup();
|
|
|
+ await popupHiddenPromise;
|
|
|
+ info("Hidden popup");
|
|
|
+
|
|
|
+ let onClose = BrowserTestUtils.waitForEvent(gBrowser.tabContainer, "TabClose");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ await onClose;
|
|
|
+ info("Tab closed");
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_bug553455.js b/browser/base/content/test/general/browser_bug553455.js
|
|
|
+--- a/browser/base/content/test/general/browser_bug553455.js
|
|
|
++++ b/browser/base/content/test/general/browser_bug553455.js
|
|
|
+@@ -252,17 +252,17 @@ async function test_disabledInstall() {
|
|
|
+ await closePromise;
|
|
|
+
|
|
|
+ try {
|
|
|
+ ok(Services.prefs.getBoolPref("xpinstall.enabled"), "Installation should be enabled");
|
|
|
+ } catch (e) {
|
|
|
+ ok(false, "xpinstall.enabled should be set");
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ let installs = await getInstalls();
|
|
|
+ is(installs.length, 0, "Shouldn't be any pending installs");
|
|
|
+ },
|
|
|
+
|
|
|
+ async function test_blockedInstall() {
|
|
|
+ let notificationPromise = waitForNotification("addon-install-blocked");
|
|
|
+ let triggers = encodeURIComponent(JSON.stringify({
|
|
|
+ "XPI": "amosigned.xpi"
|
|
|
+@@ -508,17 +508,18 @@ async function test_sequential() {
|
|
|
+ // Should have the next add-on's confirmation dialog
|
|
|
+ is(container.childNodes.length, 1, "Should be one item listed");
|
|
|
+ is(container.childNodes[0].firstChild.getAttribute("value"), "Theme Test", "Should have the right add-on");
|
|
|
+
|
|
|
+ Services.perms.remove(makeURI("http://example.com"), "install");
|
|
|
+ let closePromise = waitForNotificationClose();
|
|
|
+ cancelInstallDialog(installDialog);
|
|
|
+ await closePromise;
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ },
|
|
|
+
|
|
|
+ async function test_allUnverified() {
|
|
|
+ // This test is only relevant if using the new doorhanger UI and allowing
|
|
|
+ // unsigned add-ons
|
|
|
+ if (!Services.prefs.getBoolPref("xpinstall.customConfirmationUI", false) ||
|
|
|
+ Services.prefs.getBoolPref("xpinstall.signatures.required", true) ||
|
|
|
+ AppConstants.MOZ_REQUIRE_SIGNING) {
|
|
|
+@@ -928,17 +929,17 @@ async function test_cancel() {
|
|
|
+ await new Promise(resolve => executeSoon(resolve));
|
|
|
+
|
|
|
+ ok(!PopupNotifications.isPanelOpen, "Notification should be closed");
|
|
|
+
|
|
|
+ let installs = await getInstalls();
|
|
|
+ is(installs.length, 0, "Should be no pending install");
|
|
|
+
|
|
|
+ Services.perms.remove(makeURI("http://example.com/"), "install");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ },
|
|
|
+
|
|
|
+ async function test_failedSecurity() {
|
|
|
+ Services.prefs.setBoolPref(PREF_INSTALL_REQUIREBUILTINCERTS, false);
|
|
|
+ setupRedirect({
|
|
|
+ "Location": TESTROOT + "amosigned.xpi"
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/base/content/test/general/browser_bug575561.js b/browser/base/content/test/general/browser_bug575561.js
|
|
|
+--- a/browser/base/content/test/general/browser_bug575561.js
|
|
|
++++ b/browser/base/content/test/general/browser_bug575561.js
|
|
|
+@@ -88,10 +88,10 @@ async function testLink(aLinkIndexOrFunc
|
|
|
+ link.click();
|
|
|
+ return link.href;
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ info(`Waiting on load of ${href}`);
|
|
|
+ let loaded = await promise;
|
|
|
+ is(loaded, href, "loaded the right document");
|
|
|
+- await BrowserTestUtils.removeTab(appTab);
|
|
|
++ BrowserTestUtils.removeTab(appTab);
|
|
|
+ }
|
|
|
+diff --git a/browser/base/content/test/general/browser_bug581253.js b/browser/base/content/test/general/browser_bug581253.js
|
|
|
+--- a/browser/base/content/test/general/browser_bug581253.js
|
|
|
++++ b/browser/base/content/test/general/browser_bug581253.js
|
|
|
+@@ -7,17 +7,17 @@ var testTag = "581253_tag";
|
|
|
+
|
|
|
+ add_task(async function test_remove_bookmark_with_tag_via_edit_bookmark() {
|
|
|
+ waitForExplicitFinish();
|
|
|
+
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
|
|
|
+
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+ await PlacesUtils.bookmarks.eraseEverything();
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await PlacesTestUtils.clearHistory();
|
|
|
+ });
|
|
|
+
|
|
|
+ await PlacesUtils.bookmarks.insert({
|
|
|
+ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
|
|
|
+ title: "",
|
|
|
+ url: testURL,
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_bug596687.js b/browser/base/content/test/general/browser_bug596687.js
|
|
|
+--- a/browser/base/content/test/general/browser_bug596687.js
|
|
|
++++ b/browser/base/content/test/general/browser_bug596687.js
|
|
|
+@@ -10,16 +10,16 @@ add_task(async function test() {
|
|
|
+ }
|
|
|
+
|
|
|
+ function onTabAttrModified() {
|
|
|
+ gotTabAttrModified = true;
|
|
|
+ }
|
|
|
+
|
|
|
+ tab.addEventListener("TabClose", onTabClose);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ ok(gotTabClose, "should have got the TabClose event");
|
|
|
+ ok(!gotTabAttrModified, "shouldn't have got the TabAttrModified event after TabClose");
|
|
|
+
|
|
|
+ tab.removeEventListener("TabClose", onTabClose);
|
|
|
+ tab.removeEventListener("TabAttrModified", onTabAttrModified);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_bug623893.js b/browser/base/content/test/general/browser_bug623893.js
|
|
|
+--- a/browser/base/content/test/general/browser_bug623893.js
|
|
|
++++ b/browser/base/content/test/general/browser_bug623893.js
|
|
|
+@@ -2,22 +2,22 @@ add_task(async function test() {
|
|
|
+ await BrowserTestUtils.withNewTab("data:text/plain;charset=utf-8,1", async function(browser) {
|
|
|
+ BrowserTestUtils.loadURI(browser, "data:text/plain;charset=utf-8,2");
|
|
|
+ await BrowserTestUtils.browserLoaded(browser);
|
|
|
+
|
|
|
+ BrowserTestUtils.loadURI(browser, "data:text/plain;charset=utf-8,3");
|
|
|
+ await BrowserTestUtils.browserLoaded(browser);
|
|
|
+
|
|
|
+ await duplicate(0, "maintained the original index");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ await duplicate(-1, "went back");
|
|
|
+ await duplicate(1, "went forward");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ function promiseGetIndex(browser) {
|
|
|
+ return ContentTask.spawn(browser, null, function() {
|
|
|
+ let shistory = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
|
|
|
+ .getInterface(Ci.nsISHistory);
|
|
|
+ return shistory.index;
|
|
|
+diff --git a/browser/base/content/test/general/browser_bug676619.js.1442465-4_2.later b/browser/base/content/test/general/browser_bug676619.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/general/browser_bug676619.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,40 @@
|
|
|
++--- browser_bug676619.js
|
|
|
+++++ browser_bug676619.js
|
|
|
++@@ -47,17 +47,17 @@ async function testLink(link, name) {
|
|
|
++ async function testLocation(link, url) {
|
|
|
++ let tabPromise = BrowserTestUtils.waitForNewTab(gBrowser);
|
|
|
++
|
|
|
++ ContentTask.spawn(gBrowser.selectedBrowser, link, contentLink => {
|
|
|
++ content.document.getElementById(contentLink).click();
|
|
|
++ });
|
|
|
++
|
|
|
++ let tab = await tabPromise;
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ }
|
|
|
++
|
|
|
++ async function runTest(url) {
|
|
|
++ let tab = BrowserTestUtils.addTab(gBrowser, url);
|
|
|
++ gBrowser.selectedTab = tab;
|
|
|
++
|
|
|
++ let browser = gBrowser.getBrowserForTab(tab);
|
|
|
++ await BrowserTestUtils.browserLoaded(browser);
|
|
|
++@@ -65,17 +65,17 @@ async function runTest(url) {
|
|
|
++ await testLink("link1", "test.txt");
|
|
|
++ await testLink("link2", "video.ogg");
|
|
|
++ await testLink("link3", "just some video");
|
|
|
++ await testLink("link4", "with-target.txt");
|
|
|
++ await testLink("link5", "javascript.txt");
|
|
|
++ await testLink("link6", "test.blob");
|
|
|
++ await testLocation("link7", "http://example.com/");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ }
|
|
|
++
|
|
|
++ add_task(async function() {
|
|
|
++ requestLongerTimeout(3);
|
|
|
++ waitForExplicitFinish();
|
|
|
++
|
|
|
++ await runTest("http://mochi.test:8888/browser/browser/base/content/test/general/download_page.html");
|
|
|
++ await runTest("https://example.com:443/browser/browser/base/content/test/general/download_page.html");
|
|
|
+diff --git a/browser/base/content/test/general/browser_clipboard_pastefile.js b/browser/base/content/test/general/browser_clipboard_pastefile.js
|
|
|
+--- a/browser/base/content/test/general/browser_clipboard_pastefile.js
|
|
|
++++ b/browser/base/content/test/general/browser_clipboard_pastefile.js
|
|
|
+@@ -50,10 +50,10 @@ add_task(async function() {
|
|
|
+ resolve();
|
|
|
+ }, {capture: true, once: true});
|
|
|
+
|
|
|
+ EventUtils.synthesizeKey("v", { accelKey: true });
|
|
|
+ });
|
|
|
+
|
|
|
+ document.documentElement.removeChild(textbox);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_contentAltClick.js b/browser/base/content/test/general/browser_contentAltClick.js
|
|
|
+--- a/browser/base/content/test/general/browser_contentAltClick.js
|
|
|
++++ b/browser/base/content/test/general/browser_contentAltClick.js
|
|
|
+@@ -36,17 +36,17 @@ async function clean_up() {
|
|
|
+ for (let download of downloads) {
|
|
|
+ await downloadList.remove(download);
|
|
|
+ await download.finalize(true);
|
|
|
+ }
|
|
|
+ // Remove download history.
|
|
|
+ await PlacesTestUtils.clearHistory();
|
|
|
+
|
|
|
+ Services.prefs.clearUserPref("browser.altClickSave");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function test_alt_click() {
|
|
|
+ await setup();
|
|
|
+
|
|
|
+ let downloadList = await Downloads.getList(Downloads.ALL);
|
|
|
+ let downloads = [];
|
|
|
+ let downloadView;
|
|
|
+diff --git a/browser/base/content/test/general/browser_contextmenu_childprocess.js b/browser/base/content/test/general/browser_contextmenu_childprocess.js
|
|
|
+--- a/browser/base/content/test/general/browser_contextmenu_childprocess.js
|
|
|
++++ b/browser/base/content/test/general/browser_contextmenu_childprocess.js
|
|
|
+@@ -15,17 +15,17 @@ add_task(async function() {
|
|
|
+ await popupShownPromise;
|
|
|
+
|
|
|
+ checkMenu(contextMenu);
|
|
|
+
|
|
|
+ let popupHiddenPromise = BrowserTestUtils.waitForEvent(contextMenu, "popuphidden");
|
|
|
+ contextMenu.hidePopup();
|
|
|
+ await popupHiddenPromise;
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ function checkItems(menuitem, arr) {
|
|
|
+ for (let i = 0; i < arr.length; i += 2) {
|
|
|
+ let str = arr[i];
|
|
|
+ let details = arr[i + 1];
|
|
|
+ if (str == "---") {
|
|
|
+ is(menuitem.localName, "menuseparator", "menuseparator");
|
|
|
+diff --git a/browser/base/content/test/general/browser_contextmenu_input.js b/browser/base/content/test/general/browser_contextmenu_input.js
|
|
|
+--- a/browser/base/content/test/general/browser_contextmenu_input.js
|
|
|
++++ b/browser/base/content/test/general/browser_contextmenu_input.js
|
|
|
+@@ -247,10 +247,10 @@ add_task(async function test_text_input_
|
|
|
+ // various text elements even though it is set to type "page". That bug
|
|
|
+ // should remove the need for next line.
|
|
|
+ maybeScreenshotsPresent: true,
|
|
|
+ skipFocusChange: true
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_cleanup() {
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_decoderDoctor.js b/browser/base/content/test/general/browser_decoderDoctor.js
|
|
|
+--- a/browser/base/content/test/general/browser_decoderDoctor.js
|
|
|
++++ b/browser/base/content/test/general/browser_decoderDoctor.js
|
|
|
+@@ -66,17 +66,17 @@ async function test_decoder_doctor_notif
|
|
|
+ if (!tabChecker) {
|
|
|
+ ok(false, "Test implementation error: Missing tabChecker");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ let awaitNewTab = BrowserTestUtils.waitForNewTab(gBrowser);
|
|
|
+ button.click();
|
|
|
+ let openedTab = await awaitNewTab;
|
|
|
+ tabChecker(openedTab);
|
|
|
+- await BrowserTestUtils.removeTab(openedTab);
|
|
|
++ BrowserTestUtils.removeTab(openedTab);
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ function tab_checker_for_sumo(expectedPath) {
|
|
|
+ return function(openedTab) {
|
|
|
+ let baseURL = Services.urlFormatter.formatURLPref("app.support.baseURL");
|
|
|
+ let url = baseURL + expectedPath;
|
|
|
+ is(openedTab.linkedBrowser.currentURI.spec, url,
|
|
|
+diff --git a/browser/base/content/test/general/browser_documentnavigation.js b/browser/base/content/test/general/browser_documentnavigation.js
|
|
|
+--- a/browser/base/content/test/general/browser_documentnavigation.js
|
|
|
++++ b/browser/base/content/test/general/browser_documentnavigation.js
|
|
|
+@@ -120,17 +120,17 @@ add_task(async function() {
|
|
|
+ add_task(async function() {
|
|
|
+ await BrowserTestUtils.openNewForegroundTab(gBrowser, testPage2);
|
|
|
+
|
|
|
+ await expectFocusOnF6(false, "main-window", gURLBar.inputField,
|
|
|
+ false, "basic focus content page and second tab urlbar");
|
|
|
+ await expectFocusOnF6(false, "html2", "html2",
|
|
|
+ true, "basic focus content page with second tab");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Shift+F6 should navigate backwards. There's only one document here so the effect
|
|
|
+ // is the same.
|
|
|
+ add_task(async function() {
|
|
|
+ gURLBar.focus();
|
|
|
+ await expectFocusOnF6(true, "html1", "html1",
|
|
|
+ true, "back focus content page");
|
|
|
+@@ -211,17 +211,17 @@ add_task(async function() {
|
|
|
+
|
|
|
+ // Now go backwards
|
|
|
+
|
|
|
+ await expectFocusOnF6(false, "html3", "body3",
|
|
|
+ true, "back focus with contenteditable body");
|
|
|
+ await expectFocusOnF6(false, "main-window", gURLBar.inputField,
|
|
|
+ false, "back focus with contenteditable body urlbar");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Navigation with a frameset loaded
|
|
|
+ add_task(async function() {
|
|
|
+ await BrowserTestUtils.openNewForegroundTab(gBrowser,
|
|
|
+ "http://mochi.test:8888/browser/browser/base/content/test/general/file_documentnavigation_frameset.html");
|
|
|
+
|
|
|
+ gURLBar.focus();
|
|
|
+@@ -242,12 +242,12 @@ add_task(async function() {
|
|
|
+ true, "back focus on frameset frame 2");
|
|
|
+ await expectFocusOnF6(true, "htmlframe2", "htmlframe2",
|
|
|
+ true, "back focus on frameset frame 1");
|
|
|
+ await expectFocusOnF6(true, "htmlframe1", "htmlframe1",
|
|
|
+ true, "back focus on frameset frame 0");
|
|
|
+ await expectFocusOnF6(true, "main-window", gURLBar.inputField,
|
|
|
+ false, "back focus on frameset frame urlbar");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // XXXndeakin add tests for browsers inside of panels
|
|
|
+diff --git a/browser/base/content/test/general/browser_domFullscreen_fullscreenMode.js b/browser/base/content/test/general/browser_domFullscreen_fullscreenMode.js
|
|
|
+--- a/browser/base/content/test/general/browser_domFullscreen_fullscreenMode.js
|
|
|
++++ b/browser/base/content/test/general/browser_domFullscreen_fullscreenMode.js
|
|
|
+@@ -232,10 +232,10 @@ add_task(async function() {
|
|
|
+ // Exit fullscreen mode if we are still in
|
|
|
+ if (window.fullScreen) {
|
|
|
+ info("> Cleanup");
|
|
|
+ executeSoon(() => BrowserFullScreen());
|
|
|
+ await waitForFullscreenChanges(FS_CHANGE_SIZE);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_e10s_about_page_triggeringprincipal.js b/browser/base/content/test/general/browser_e10s_about_page_triggeringprincipal.js
|
|
|
+--- a/browser/base/content/test/general/browser_e10s_about_page_triggeringprincipal.js
|
|
|
++++ b/browser/base/content/test/general/browser_e10s_about_page_triggeringprincipal.js
|
|
|
+@@ -69,17 +69,17 @@ add_task(async function test_principal_c
|
|
|
+ let contentPolicyType = channel.loadInfo.externalContentPolicyType;
|
|
|
+ is(contentPolicyType, Ci.nsIContentPolicy.TYPE_DOCUMENT,
|
|
|
+ "sanity check - loading a top level document");
|
|
|
+
|
|
|
+ let loadingPrincipal = channel.loadInfo.loadingPrincipal;
|
|
|
+ is(loadingPrincipal, null,
|
|
|
+ "sanity check - load of TYPE_DOCUMENT must have a null loadingPrincipal");
|
|
|
+ });
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_principal_right_click_open_link_in_new_tab() {
|
|
|
+ await kAboutPagesRegistered;
|
|
|
+ await SpecialPowers.pushPrefEnv({
|
|
|
+ "set": [["security.sandbox.content.level", 1]],
|
|
|
+ });
|
|
|
+@@ -114,11 +114,11 @@ add_task(async function test_principal_r
|
|
|
+ let contentPolicyType = channel.loadInfo.externalContentPolicyType;
|
|
|
+ is(contentPolicyType, Ci.nsIContentPolicy.TYPE_DOCUMENT,
|
|
|
+ "sanity check - loading a top level document");
|
|
|
+
|
|
|
+ let loadingPrincipal = channel.loadInfo.loadingPrincipal;
|
|
|
+ is(loadingPrincipal, null,
|
|
|
+ "sanity check - load of TYPE_DOCUMENT must have a null loadingPrincipal");
|
|
|
+ });
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_invalid_uri_back_forward_manipulation.js b/browser/base/content/test/general/browser_invalid_uri_back_forward_manipulation.js
|
|
|
+--- a/browser/base/content/test/general/browser_invalid_uri_back_forward_manipulation.js
|
|
|
++++ b/browser/base/content/test/general/browser_invalid_uri_back_forward_manipulation.js
|
|
|
+@@ -26,10 +26,10 @@ add_task(async function checkBackFromInv
|
|
|
+ // Be paranoid we *are* actually seeing this other page load, not some kind of race
|
|
|
+ // for if/when we do start firing pageshow for the error page...
|
|
|
+ function(e) { return gBrowser.currentURI.spec == "about:robots"; }
|
|
|
+ );
|
|
|
+ gBrowser.goBack();
|
|
|
+ await promiseOtherPageLoaded;
|
|
|
+ ok(gBrowser.webNavigation.canGoForward, "Should be able to go forward from previous page.");
|
|
|
+ }
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_keywordBookmarklets.js.1442465-4_2.later b/browser/base/content/test/general/browser_keywordBookmarklets.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/general/browser_keywordBookmarklets.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_keywordBookmarklets.js
|
|
|
+++++ browser_keywordBookmarklets.js
|
|
|
++@@ -7,17 +7,17 @@ add_task(async function test_keyword_boo
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
|
|
|
++ let bm = await PlacesUtils.bookmarks.insert({
|
|
|
++ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
|
|
|
++ title: "bookmarklet",
|
|
|
++ url: "javascript:'1';"
|
|
|
++ });
|
|
|
++
|
|
|
++ registerCleanupFunction(async function() {
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ await PlacesUtils.bookmarks.remove(bm);
|
|
|
++ });
|
|
|
++
|
|
|
++ let originalPrincipal = gBrowser.contentPrincipal;
|
|
|
++ let originalPrincipalURI = await getPrincipalURI(tab.linkedBrowser);
|
|
|
++
|
|
|
++ await PlacesUtils.keywords.insert({ keyword: "bm", url: "javascript:'1';" });
|
|
|
++
|
|
|
+diff --git a/browser/base/content/test/general/browser_modifiedclick_inherit_principal.js b/browser/base/content/test/general/browser_modifiedclick_inherit_principal.js
|
|
|
+--- a/browser/base/content/test/general/browser_modifiedclick_inherit_principal.js
|
|
|
++++ b/browser/base/content/test/general/browser_modifiedclick_inherit_principal.js
|
|
|
+@@ -20,11 +20,11 @@ add_task(async function() {
|
|
|
+ info("Added element");
|
|
|
+ await BrowserTestUtils.synthesizeMouseAtCenter("a", {button: 1}, browser);
|
|
|
+ let newTab = await newTabPromise;
|
|
|
+ is(newTab.linkedBrowser.contentPrincipal.origin, "http://example.com",
|
|
|
+ "Principal should be for example.com");
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, newTab);
|
|
|
+ info(gURLBar.value);
|
|
|
+ isnot(gURLBar.value, "", "URL bar should not be empty.");
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_newTabDrop.js b/browser/base/content/test/general/browser_newTabDrop.js
|
|
|
+--- a/browser/base/content/test/general/browser_newTabDrop.js
|
|
|
++++ b/browser/base/content/test/general/browser_newTabDrop.js
|
|
|
+@@ -1,11 +1,11 @@
|
|
|
+ registerCleanupFunction(async function cleanup() {
|
|
|
+ while (gBrowser.tabs.length > 1) {
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
|
|
|
+ }
|
|
|
+ Services.search.currentEngine = originalEngine;
|
|
|
+ let engine = Services.search.getEngineByName("MozSearch");
|
|
|
+ Services.search.removeEngine(engine);
|
|
|
+ });
|
|
|
+
|
|
|
+ let originalEngine;
|
|
|
+ add_task(async function test_setup() {
|
|
|
+@@ -82,16 +82,16 @@ async function drop(dragData, expectedTa
|
|
|
+ EventUtils.synthesizeDrop(dragSrcElement, newTabButton, dragData, "link", window);
|
|
|
+
|
|
|
+ let tabsOpened = false;
|
|
|
+ if (awaitTabOpen) {
|
|
|
+ await awaitTabOpen;
|
|
|
+ info("Got TabOpen event");
|
|
|
+ tabsOpened = true;
|
|
|
+ for (let tab of openedTabs) {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ is(tabsOpened, !!expectedTabOpenCount, `Tabs for ${dragDataString} should only open if any of dropped items are valid`);
|
|
|
+
|
|
|
+ await awaitDrop;
|
|
|
+ ok(true, "Got drop event");
|
|
|
+ }
|
|
|
+diff --git a/browser/base/content/test/general/browser_new_http_window_opened_from_file_tab.js b/browser/base/content/test/general/browser_new_http_window_opened_from_file_tab.js
|
|
|
+--- a/browser/base/content/test/general/browser_new_http_window_opened_from_file_tab.js
|
|
|
++++ b/browser/base/content/test/general/browser_new_http_window_opened_from_file_tab.js
|
|
|
+@@ -7,17 +7,17 @@ const TEST_HTTP = "http://example.org/";
|
|
|
+ // Test for bug 1338375.
|
|
|
+ add_task(async function() {
|
|
|
+ // Open file:// page.
|
|
|
+ let dir = getChromeDir(getResolvedURI(gTestPath));
|
|
|
+ dir.append(TEST_FILE);
|
|
|
+ const uriString = Services.io.newFileURI(dir).spec;
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, uriString);
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ let browser = tab.linkedBrowser;
|
|
|
+
|
|
|
+ // Set pref to open in new window.
|
|
|
+ Services.prefs.setIntPref("browser.link.open_newwindow", 2);
|
|
|
+ registerCleanupFunction(function() {
|
|
|
+ Services.prefs.clearUserPref("browser.link.open_newwindow");
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_page_style_menu.js b/browser/base/content/test/general/browser_page_style_menu.js
|
|
|
+--- a/browser/base/content/test/general/browser_page_style_menu.js
|
|
|
++++ b/browser/base/content/test/general/browser_page_style_menu.js
|
|
|
+@@ -88,10 +88,10 @@ add_task(async function() {
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return contentValidLinks;
|
|
|
+ });
|
|
|
+
|
|
|
+ ok(items.length, "At least one item in the menu");
|
|
|
+ is(items.length, validLinks, "all valid links found");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_page_style_menu_update.js b/browser/base/content/test/general/browser_page_style_menu_update.js
|
|
|
+--- a/browser/base/content/test/general/browser_page_style_menu_update.js
|
|
|
++++ b/browser/base/content/test/general/browser_page_style_menu_update.js
|
|
|
+@@ -58,10 +58,10 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ gPageStyleMenu.fillPopup(menupopup);
|
|
|
+ // gPageStyleMenu empties out the menu between opens, so we need
|
|
|
+ // to get a new reference to the selected menuitem
|
|
|
+ selected = menupopup.querySelector("menuitem[checked='true']");
|
|
|
+ is(selected.getAttribute("label"), "1", "Should now have stylesheet 1 selected");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_remoteWebNavigation_postdata.js b/browser/base/content/test/general/browser_remoteWebNavigation_postdata.js
|
|
|
+--- a/browser/base/content/test/general/browser_remoteWebNavigation_postdata.js
|
|
|
++++ b/browser/base/content/test/general/browser_remoteWebNavigation_postdata.js
|
|
|
+@@ -36,14 +36,14 @@ add_task(async function test_remoteWebNa
|
|
|
+ "Content-Length: 7\r\n" +
|
|
|
+ "Content-Type: application/x-www-form-urlencoded\r\n" +
|
|
|
+ "\r\n" +
|
|
|
+ "success";
|
|
|
+
|
|
|
+ openUILinkIn(path, "tab", null, makeInputStream(postdata));
|
|
|
+
|
|
|
+ });
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ await new Promise(resolve => {
|
|
|
+ server.stop(function() { resolve(); });
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_storagePressure_notification.js b/browser/base/content/test/general/browser_storagePressure_notification.js
|
|
|
+--- a/browser/base/content/test/general/browser_storagePressure_notification.js
|
|
|
++++ b/browser/base/content/test/general/browser_storagePressure_notification.js
|
|
|
+@@ -37,18 +37,18 @@ async function testOverUsageThresholdNot
|
|
|
+ let prefBtn = notification.getElementsByTagName("button")[1];
|
|
|
+ let aboutPrefPromise = openAboutPrefPromise();
|
|
|
+ prefBtn.doCommand();
|
|
|
+ await aboutPrefPromise;
|
|
|
+ let aboutPrefTab = gBrowser.selectedTab;
|
|
|
+ let prefDoc = gBrowser.selectedBrowser.contentDocument;
|
|
|
+ let siteDataGroup = prefDoc.getElementById("siteDataGroup");
|
|
|
+ is_element_visible(siteDataGroup, "Should open to the siteDataGroup section in about:preferences");
|
|
|
+- await BrowserTestUtils.removeTab(aboutPrefTab);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(aboutPrefTab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ // Test only displaying notification once within the given interval
|
|
|
+ add_task(async function() {
|
|
|
+ const TEST_NOTIFICATION_INTERVAL_MS = 2000;
|
|
|
+ await SpecialPowers.pushPrefEnv({set: [["browser.storageManager.pressureNotification.minIntervalMS", TEST_NOTIFICATION_INTERVAL_MS]]});
|
|
|
+ // Commenting this to see if we really need it
|
|
|
+ // await SpecialPowers.pushPrefEnv({set: [["privacy.reduceTimerPrecision", false]]});
|
|
|
+diff --git a/browser/base/content/test/general/browser_tabDrop.js b/browser/base/content/test/general/browser_tabDrop.js
|
|
|
+--- a/browser/base/content/test/general/browser_tabDrop.js
|
|
|
++++ b/browser/base/content/test/general/browser_tabDrop.js
|
|
|
+@@ -1,11 +1,11 @@
|
|
|
+ registerCleanupFunction(async function cleanup() {
|
|
|
+ while (gBrowser.tabs.length > 1) {
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
|
|
|
+ }
|
|
|
+ Services.search.currentEngine = originalEngine;
|
|
|
+ let engine = Services.search.getEngineByName("MozSearch");
|
|
|
+ Services.search.removeEngine(engine);
|
|
|
+ });
|
|
|
+
|
|
|
+ let originalEngine;
|
|
|
+ add_task(async function test_setup() {
|
|
|
+@@ -86,16 +86,16 @@ async function drop(dragData, expectedTa
|
|
|
+ };
|
|
|
+ EventUtils.synthesizeDrop(gBrowser.selectedTab, gBrowser.selectedTab, dragData, "link", window, undefined, event);
|
|
|
+ let tabsOpened = false;
|
|
|
+ if (awaitTabOpen) {
|
|
|
+ await awaitTabOpen;
|
|
|
+ info("Got TabOpen event");
|
|
|
+ tabsOpened = true;
|
|
|
+ for (let tab of openedTabs) {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ is(tabsOpened, !!expectedTabOpenCount, `Tabs for ${dragDataString} should only open if any of dropped items are valid`);
|
|
|
+
|
|
|
+ await awaitDrop;
|
|
|
+ ok(true, "Got drop event");
|
|
|
+ }
|
|
|
+diff --git a/browser/base/content/test/general/browser_tab_close_dependent_window.js b/browser/base/content/test/general/browser_tab_close_dependent_window.js
|
|
|
+--- a/browser/base/content/test/general/browser_tab_close_dependent_window.js
|
|
|
++++ b/browser/base/content/test/general/browser_tab_close_dependent_window.js
|
|
|
+@@ -2,17 +2,17 @@
|
|
|
+
|
|
|
+ add_task(async function closing_tab_with_dependents_should_close_window() {
|
|
|
+ info("Opening window");
|
|
|
+ let win = await BrowserTestUtils.openNewBrowserWindow();
|
|
|
+
|
|
|
+ info("Opening tab with data URI");
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(win.gBrowser, `data:text/html,<html%20onclick="W=window.open()"><body%20onbeforeunload="W.close()">`);
|
|
|
+ info("Closing original tab in this window.");
|
|
|
+- await BrowserTestUtils.removeTab(win.gBrowser.tabs[0]);
|
|
|
++ BrowserTestUtils.removeTab(win.gBrowser.tabs[0]);
|
|
|
+ info("Clicking into the window");
|
|
|
+ let depTabOpened = BrowserTestUtils.waitForEvent(win.gBrowser.tabContainer, "TabOpen");
|
|
|
+ await BrowserTestUtils.synthesizeMouse("html", 0, 0, {}, tab.linkedBrowser);
|
|
|
+
|
|
|
+ let openedTab = (await depTabOpened).target;
|
|
|
+ info("Got opened tab");
|
|
|
+
|
|
|
+ let windowClosedPromise = BrowserTestUtils.windowClosed(win);
|
|
|
+diff --git a/browser/base/content/test/general/browser_tabs_close_beforeunload.js b/browser/base/content/test/general/browser_tabs_close_beforeunload.js
|
|
|
+--- a/browser/base/content/test/general/browser_tabs_close_beforeunload.js
|
|
|
++++ b/browser/base/content/test/general/browser_tabs_close_beforeunload.js
|
|
|
+@@ -34,13 +34,13 @@ add_task(async function() {
|
|
|
+ let closeBtn = document.getAnonymousElementByAttribute(secondTab, "anonid", "close-button");
|
|
|
+ info("closing second tab (which will self-close in beforeunload)");
|
|
|
+ closeBtn.click();
|
|
|
+ ok(secondTab.closing, "Second tab should be marked as closing synchronously.");
|
|
|
+ ok(!secondTab.linkedBrowser, "Second tab's browser should be dead");
|
|
|
+ ok(!firstTab.closing, "First tab should not be closing");
|
|
|
+ ok(firstTab.linkedBrowser, "First tab's browser should be alive");
|
|
|
+ info("closing first tab");
|
|
|
+- await BrowserTestUtils.removeTab(firstTab);
|
|
|
++ BrowserTestUtils.removeTab(firstTab);
|
|
|
+
|
|
|
+ ok(firstTab.closing, "First tab should be marked as closing");
|
|
|
+ ok(!firstTab.linkedBrowser, "First tab's browser should be dead");
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_unloaddialogs.js b/browser/base/content/test/general/browser_unloaddialogs.js
|
|
|
+--- a/browser/base/content/test/general/browser_unloaddialogs.js
|
|
|
++++ b/browser/base/content/test/general/browser_unloaddialogs.js
|
|
|
+@@ -30,12 +30,12 @@ var testUrls =
|
|
|
+ ];
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ for (let url of testUrls) {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, url);
|
|
|
+ ok(true, "Loaded page " + url);
|
|
|
+ // Wait one turn of the event loop before closing, so everything settles.
|
|
|
+ await new Promise(resolve => setTimeout(resolve, 0));
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ ok(true, "Closed page " + url + " without timeout");
|
|
|
+ }
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/general/browser_windowactivation.js b/browser/base/content/test/general/browser_windowactivation.js
|
|
|
+--- a/browser/base/content/test/general/browser_windowactivation.js
|
|
|
++++ b/browser/base/content/test/general/browser_windowactivation.js
|
|
|
+@@ -92,18 +92,18 @@ add_task(async function reallyRunTests()
|
|
|
+
|
|
|
+ gBrowser.selectedTab = tab1;
|
|
|
+
|
|
|
+ // Start the test.
|
|
|
+ sendGetBackgroundRequest(true);
|
|
|
+
|
|
|
+ await testFinished.promise;
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ otherWindow = null;
|
|
|
+ });
|
|
|
+
|
|
|
+ function sendGetBackgroundRequest(ifChanged) {
|
|
|
+ browser1.messageManager.sendAsyncMessage("Test:GetBackgroundColor", { ifChanged });
|
|
|
+ browser2.messageManager.sendAsyncMessage("Test:GetBackgroundColor", { ifChanged });
|
|
|
+ }
|
|
|
+
|
|
|
+diff --git a/browser/base/content/test/metaTags/browser_bad_meta_tags.js.1442465-4_2.later b/browser/base/content/test/metaTags/browser_bad_meta_tags.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/metaTags/browser_bad_meta_tags.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,16 @@
|
|
|
++--- browser_bad_meta_tags.js
|
|
|
+++++ browser_bad_meta_tags.js
|
|
|
++@@ -14,12 +14,12 @@ const TEST_PATH = getRootDirectory(gTest
|
|
|
++ add_task(async function test_bad_meta_tags() {
|
|
|
++ const tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_PATH);
|
|
|
++
|
|
|
++ // Wait until places has stored the page info
|
|
|
++ const pageInfo = await waitForPageInfo(TEST_PATH);
|
|
|
++ is(pageInfo.description, "description", "did not collect a og:description because meta tag was malformed");
|
|
|
++ is(pageInfo.previewImageURL.href, "http://test.com/twitter-image.jpg", "did not collect og:image because of invalid loading principal");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ await PlacesUtils.history.clear();
|
|
|
++ });
|
|
|
++
|
|
|
+diff --git a/browser/base/content/test/metaTags/browser_meta_tags.js.1442465-4_2.later b/browser/base/content/test/metaTags/browser_meta_tags.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/metaTags/browser_meta_tags.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,36 @@
|
|
|
++--- browser_meta_tags.js
|
|
|
+++++ browser_meta_tags.js
|
|
|
++@@ -13,17 +13,17 @@ const TEST_PATH = getRootDirectory(gTest
|
|
|
++ add_task(async function test_metadata() {
|
|
|
++ const tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_PATH);
|
|
|
++
|
|
|
++ // Wait until places has stored the page info
|
|
|
++ const pageInfo = await waitForPageInfo(TEST_PATH);
|
|
|
++ is(pageInfo.description, "og:description", "got the correct description");
|
|
|
++ is(pageInfo.previewImageURL.href, "https://test.com/og-image-secure-url.jpg", "got the correct preview image");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ await PlacesUtils.history.clear();
|
|
|
++ });
|
|
|
++
|
|
|
++ /**
|
|
|
++ * This test is almost like the previous one except it opens a second tab to
|
|
|
++ * make sure the extra tab does not cause the debounce logic to be skipped. If
|
|
|
++ * incorrectly skipped, the updated metadata would not include the delayed meta.
|
|
|
++ */
|
|
|
++@@ -34,12 +34,12 @@ add_task(async function multiple_tabs()
|
|
|
++ // desired URL in a background tab, which results in its timers being throttled.
|
|
|
++ gBrowser.addTab();
|
|
|
++
|
|
|
++ // Wait until places has stored the page info
|
|
|
++ const pageInfo = await waitForPageInfo(TEST_PATH);
|
|
|
++ is(pageInfo.description, "og:description", "got the correct description");
|
|
|
++ is(pageInfo.previewImageURL.href, "https://test.com/og-image-secure-url.jpg", "got the correct preview image");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ await PlacesUtils.history.clear();
|
|
|
++ });
|
|
|
+diff --git a/browser/base/content/test/performance/browser_favicon_load.js b/browser/base/content/test/performance/browser_favicon_load.js
|
|
|
+--- a/browser/base/content/test/performance/browser_favicon_load.js
|
|
|
++++ b/browser/base/content/test/performance/browser_favicon_load.js
|
|
|
+@@ -123,17 +123,17 @@ async function doTest(aTestPage, aFavico
|
|
|
+ // Open the tab.
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, aTestPage);
|
|
|
+ // Waiting for favicon requests are all made.
|
|
|
+ await observer.promise;
|
|
|
+ // Waiting for favicon loaded.
|
|
|
+ await promiseWaitOnFaviconLoaded;
|
|
|
+
|
|
|
+ // Close the tab.
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ async function setupTailingPreference(aTailingEnabled) {
|
|
|
+ await SpecialPowers.pushPrefEnv({"set": [
|
|
|
+ ["network.http.tailing.enabled", aTailingEnabled]
|
|
|
+ ]});
|
|
|
+ }
|
|
|
+
|
|
|
+diff --git a/browser/base/content/test/performance/browser_startup_content.js b/browser/base/content/test/performance/browser_startup_content.js
|
|
|
+--- a/browser/base/content/test/performance/browser_startup_content.js
|
|
|
++++ b/browser/base/content/test/performance/browser_startup_content.js
|
|
|
+@@ -86,10 +86,10 @@ add_task(async function() {
|
|
|
+ }
|
|
|
+ for (let file in loadedList[scriptType]) {
|
|
|
+ info(file);
|
|
|
+ if (kDumpAllStacks && loadedList[scriptType][file])
|
|
|
+ info(loadedList[scriptType][file]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/performance/browser_tabopen_reflows.js b/browser/base/content/test/performance/browser_tabopen_reflows.js
|
|
|
+--- a/browser/base/content/test/performance/browser_tabopen_reflows.js
|
|
|
++++ b/browser/base/content/test/performance/browser_tabopen_reflows.js
|
|
|
+@@ -34,11 +34,11 @@ add_task(async function() {
|
|
|
+ let switchDone = BrowserTestUtils.waitForEvent(window, "TabSwitchDone");
|
|
|
+ BrowserOpenTab();
|
|
|
+ await BrowserTestUtils.waitForEvent(gBrowser.selectedTab, "transitionend",
|
|
|
+ false, e => e.propertyName === "max-width");
|
|
|
+ await switchDone;
|
|
|
+ }, EXPECTED_REFLOWS);
|
|
|
+
|
|
|
+ let switchDone = BrowserTestUtils.waitForEvent(window, "TabSwitchDone");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ await switchDone;
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/performance/browser_tabstrip_overflow_underflow_reflows.js.1442465-4_2.later b/browser/base/content/test/performance/browser_tabstrip_overflow_underflow_reflows.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/performance/browser_tabstrip_overflow_underflow_reflows.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,58 @@
|
|
|
++--- browser_tabstrip_overflow_underflow_reflows.js
|
|
|
+++++ browser_tabstrip_overflow_underflow_reflows.js
|
|
|
++@@ -61,17 +61,17 @@ add_task(async function() {
|
|
|
++ await switchDone;
|
|
|
++ await BrowserTestUtils.waitForCondition(() => {
|
|
|
++ return gBrowser.tabContainer.arrowScrollbox.hasAttribute("scrolledtoend");
|
|
|
++ });
|
|
|
++ }, [], window);
|
|
|
++
|
|
|
++ await withReflowObserver(async function(dirtyFrame) {
|
|
|
++ let switchDone = BrowserTestUtils.waitForEvent(window, "TabSwitchDone");
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab, { animate: true });
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab, { animate: true });
|
|
|
++ await switchDone;
|
|
|
++ }, [], window);
|
|
|
++
|
|
|
++ // At this point, we have an overflowed tab strip, and we've got the last tab
|
|
|
++ // selected. This should mean that the first tab is scrolled out of view.
|
|
|
++ // Let's test that we don't reflow when switching to that first tab.
|
|
|
++ let lastTab = gBrowser.selectedTab;
|
|
|
++ let arrowScrollbox = gBrowser.tabContainer.arrowScrollbox;
|
|
|
++@@ -87,17 +87,17 @@ add_task(async function() {
|
|
|
++ await BrowserTestUtils.switchTab(gBrowser, firstTab);
|
|
|
++ await BrowserTestUtils.waitForCondition(() => {
|
|
|
++ return gBrowser.tabContainer.arrowScrollbox.hasAttribute("scrolledtostart");
|
|
|
++ });
|
|
|
++ }, [], window);
|
|
|
++
|
|
|
++ // Okay, now close the last tab. The tabstrip should stay overflowed, but removing
|
|
|
++ // one more after that should underflow it.
|
|
|
++- await BrowserTestUtils.removeTab(lastTab);
|
|
|
+++ BrowserTestUtils.removeTab(lastTab);
|
|
|
++
|
|
|
++ Assert.ok(gBrowser.tabContainer.hasAttribute("overflow"),
|
|
|
++ "Tabs should still be overflowed.");
|
|
|
++
|
|
|
++ // Depending on the size of the window, it might take one or more tab
|
|
|
++ // removals to put the tab strip out of the overflow state, so we'll just
|
|
|
++ // keep testing removals until that occurs.
|
|
|
++ while (gBrowser.tabContainer.hasAttribute("overflow")) {
|
|
|
++@@ -105,16 +105,16 @@ add_task(async function() {
|
|
|
++ if (gBrowser.selectedTab !== lastTab) {
|
|
|
++ await BrowserTestUtils.switchTab(gBrowser, lastTab);
|
|
|
++ }
|
|
|
++
|
|
|
++ // ... and make sure we don't flush layout when closing it, and exiting
|
|
|
++ // the overflowed state.
|
|
|
++ await withReflowObserver(async function() {
|
|
|
++ let switchDone = BrowserTestUtils.waitForEvent(window, "TabSwitchDone");
|
|
|
++- await BrowserTestUtils.removeTab(lastTab, { animate: true });
|
|
|
+++ BrowserTestUtils.removeTab(lastTab, { animate: true });
|
|
|
++ await switchDone;
|
|
|
++ await BrowserTestUtils.waitForCondition(() => !lastTab.isConnected);
|
|
|
++ }, EXPECTED_UNDERFLOW_REFLOWS, window);
|
|
|
++ }
|
|
|
++
|
|
|
++ await removeAllButFirstTab();
|
|
|
++ });
|
|
|
+diff --git a/browser/base/content/test/performance/browser_tabswitch_reflows.js b/browser/base/content/test/performance/browser_tabswitch_reflows.js
|
|
|
+--- a/browser/base/content/test/performance/browser_tabswitch_reflows.js
|
|
|
++++ b/browser/base/content/test/performance/browser_tabswitch_reflows.js
|
|
|
+@@ -38,10 +38,10 @@ add_task(async function() {
|
|
|
+ await firstSwitchDone;
|
|
|
+
|
|
|
+ await withReflowObserver(async function() {
|
|
|
+ let switchDone = BrowserTestUtils.waitForEvent(window, "TabSwitchDone");
|
|
|
+ gBrowser.selectedTab = origTab;
|
|
|
+ await switchDone;
|
|
|
+ }, EXPECTED_REFLOWS);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(otherTab);
|
|
|
++ BrowserTestUtils.removeTab(otherTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/permissions/browser_reservedkey.js b/browser/base/content/test/permissions/browser_reservedkey.js
|
|
|
+--- a/browser/base/content/test/permissions/browser_reservedkey.js
|
|
|
++++ b/browser/base/content/test/permissions/browser_reservedkey.js
|
|
|
+@@ -31,17 +31,17 @@ add_task(async function test_reserved_sh
|
|
|
+ EventUtils.sendString("OPQ");
|
|
|
+
|
|
|
+ is(document.getElementById("kt_reserved").getAttribute("count"), "2", "reserved='true' with preference on");
|
|
|
+ is(document.getElementById("kt_notreserved").getAttribute("count"), "0", "reserved='false' with preference on");
|
|
|
+ is(document.getElementById("kt_reserveddefault").getAttribute("count"), "1", "default reserved with preference on");
|
|
|
+
|
|
|
+ document.documentElement.removeChild(container);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // This test checks that Alt+<key> and F10 cannot be blocked when the preference is set.
|
|
|
+ if (!navigator.platform.includes("Mac")) {
|
|
|
+ add_task(async function test_accesskeys_menus() {
|
|
|
+ await new Promise(resolve => {
|
|
|
+ SpecialPowers.pushPrefEnv({"set": [["permissions.default.shortcuts", 2]]}, resolve);
|
|
|
+ });
|
|
|
+@@ -78,17 +78,17 @@ if (!navigator.platform.includes("Mac"))
|
|
|
+ await popupShown;
|
|
|
+
|
|
|
+ ok(true, "File menu opened");
|
|
|
+
|
|
|
+ popupHidden = BrowserTestUtils.waitForEvent(filePopup, "popuphidden");
|
|
|
+ filePopup.hidePopup();
|
|
|
+ await popupHidden;
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ // There is a <key> element for Backspace with reserved="false", so make sure that it is not
|
|
|
+ // treated as a blocked shortcut key.
|
|
|
+ add_task(async function test_backspace() {
|
|
|
+ await new Promise(resolve => {
|
|
|
+ SpecialPowers.pushPrefEnv({"set": [["permissions.default.shortcuts", 2]]}, resolve);
|
|
|
+diff --git a/browser/base/content/test/permissions/browser_temporary_permissions_tabs.js b/browser/base/content/test/permissions/browser_temporary_permissions_tabs.js
|
|
|
+--- a/browser/base/content/test/permissions/browser_temporary_permissions_tabs.js
|
|
|
++++ b/browser/base/content/test/permissions/browser_temporary_permissions_tabs.js
|
|
|
+@@ -55,12 +55,12 @@ add_task(async function testTempPermissi
|
|
|
+
|
|
|
+ Assert.notEqual(geoIcon.boxObject.width, 0, "geo anchor should be visible");
|
|
|
+
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, tab1);
|
|
|
+
|
|
|
+ Assert.equal(geoIcon.boxObject.width, 0, "geo anchor should not be visible");
|
|
|
+
|
|
|
+ SitePermissions.remove(uri, id, tab2.linkedBrowser);
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/base/content/test/popupNotifications/browser_reshow_in_background.js b/browser/base/content/test/popupNotifications/browser_reshow_in_background.js
|
|
|
+--- a/browser/base/content/test/popupNotifications/browser_reshow_in_background.js
|
|
|
++++ b/browser/base/content/test/popupNotifications/browser_reshow_in_background.js
|
|
|
+@@ -45,11 +45,11 @@ add_task(async function test_background_
|
|
|
+ Assert.equal(seenEvents[0], "showing", "Should have said popup was showing.");
|
|
|
+ Assert.equal(seenEvents[1], "shown", "Should have said popup was shown.");
|
|
|
+
|
|
|
+ let panelHidden =
|
|
|
+ BrowserTestUtils.waitForEvent(PopupNotifications.panel, "popuphidden");
|
|
|
+ PopupNotifications.remove(notification);
|
|
|
+ await panelHidden;
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tabB);
|
|
|
+- await BrowserTestUtils.removeTab(tabC);
|
|
|
++ BrowserTestUtils.removeTab(tabB);
|
|
|
++ BrowserTestUtils.removeTab(tabC);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/popups/browser_popup_frames.js b/browser/base/content/test/popups/browser_popup_frames.js
|
|
|
+--- a/browser/base/content/test/popups/browser_popup_frames.js
|
|
|
++++ b/browser/base/content/test/popups/browser_popup_frames.js
|
|
|
+@@ -77,11 +77,11 @@ add_task(async function test_opening_blo
|
|
|
+
|
|
|
+ await BrowserTestUtils.waitForCondition(() =>
|
|
|
+ !gBrowser.getNotificationBox().getNotificationWithValue("popup-blocked"));
|
|
|
+ ok(!gBrowser.getNotificationBox().getNotificationWithValue("popup-blocked"),
|
|
|
+ "Should no longer have notification");
|
|
|
+ ok(document.getElementById("page-report-button").hidden,
|
|
|
+ "URL bar popup indicator should be hidden");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/base/content/test/siteIdentity/browser_insecureLoginForms.js b/browser/base/content/test/siteIdentity/browser_insecureLoginForms.js
|
|
|
+--- a/browser/base/content/test/siteIdentity/browser_insecureLoginForms.js
|
|
|
++++ b/browser/base/content/test/siteIdentity/browser_insecureLoginForms.js
|
|
|
+@@ -152,11 +152,11 @@ add_task(async function test_ignoring_wi
|
|
|
+ "Using expected icon image in the Control Center subview");
|
|
|
+
|
|
|
+ ok(Array.every(document.querySelectorAll("[when-loginforms=insecure]"),
|
|
|
+ element => is_hidden(element)),
|
|
|
+ "All messages should be hidden.");
|
|
|
+
|
|
|
+ gIdentityHandler._identityPopup.hidden = true;
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js b/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js
|
|
|
+--- a/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js
|
|
|
++++ b/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js
|
|
|
+@@ -44,11 +44,11 @@ add_task(async function() {
|
|
|
+ await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
|
|
|
+ checkIdentityPopup("connection-mixed-passive-loaded.svg");
|
|
|
+
|
|
|
+ // remove cert exception
|
|
|
+ let certOverrideService = Cc["@mozilla.org/security/certoverride;1"]
|
|
|
+ .getService(Ci.nsICertOverrideService);
|
|
|
+ certOverrideService.clearValidityOverride("self-signed.example.com", -1);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/base/content/test/siteIdentity/browser_no_mcb_on_http_site.js b/browser/base/content/test/siteIdentity/browser_no_mcb_on_http_site.js
|
|
|
+--- a/browser/base/content/test/siteIdentity/browser_no_mcb_on_http_site.js
|
|
|
++++ b/browser/base/content/test/siteIdentity/browser_no_mcb_on_http_site.js
|
|
|
+@@ -97,10 +97,10 @@ add_task(async function test3() {
|
|
|
+ });
|
|
|
+
|
|
|
+ ok(true, "test3 passed");
|
|
|
+ });
|
|
|
+
|
|
|
+ // ------------------------------------------------------
|
|
|
+
|
|
|
+ add_task(async function cleanup() {
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/tabPrompts/browser_multiplePrompts.js b/browser/base/content/test/tabPrompts/browser_multiplePrompts.js
|
|
|
+--- a/browser/base/content/test/tabPrompts/browser_multiplePrompts.js
|
|
|
++++ b/browser/base/content/test/tabPrompts/browser_multiplePrompts.js
|
|
|
+@@ -63,10 +63,10 @@ add_task(async function() {
|
|
|
+ Services.tm.dispatchToMainThread(resolve);
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ let prompts = tab.linkedBrowser.parentNode.querySelectorAll("tabmodalprompt");
|
|
|
+ is(prompts.length, 0, "Prompts should all be dismissed.");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/tabPrompts/browser_openPromptInBackgroundTab.js b/browser/base/content/test/tabPrompts/browser_openPromptInBackgroundTab.js
|
|
|
+--- a/browser/base/content/test/tabPrompts/browser_openPromptInBackgroundTab.js
|
|
|
++++ b/browser/base/content/test/tabPrompts/browser_openPromptInBackgroundTab.js
|
|
|
+@@ -70,10 +70,10 @@ add_task(async function() {
|
|
|
+
|
|
|
+ // This is sync in non-e10s, but in e10s we need to wait for this, so yield anyway.
|
|
|
+ // Note that the switchTab promise doesn't actually guarantee anything about *which*
|
|
|
+ // tab ends up as selected when its event fires, so using that here wouldn't work.
|
|
|
+ await openedTabSelectedPromise;
|
|
|
+ // should be switched back
|
|
|
+ ok(openedTab.selected, "Ta-dah, the other tab should now be selected again!");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(openedTab);
|
|
|
++ BrowserTestUtils.removeTab(openedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/tabs/browser_allow_process_switches_despite_related_browser.js b/browser/base/content/test/tabs/browser_allow_process_switches_despite_related_browser.js
|
|
|
+--- a/browser/base/content/test/tabs/browser_allow_process_switches_despite_related_browser.js
|
|
|
++++ b/browser/base/content/test/tabs/browser_allow_process_switches_despite_related_browser.js
|
|
|
+@@ -4,24 +4,24 @@
|
|
|
+ const DUMMY_FILE = "dummy_page.html";
|
|
|
+ const DATA_URI = "data:text/html,Hi";
|
|
|
+ const DATA_URI_SOURCE = "view-source:" + DATA_URI;
|
|
|
+
|
|
|
+ // Test for bug 1328829.
|
|
|
+ add_task(async function() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, DATA_URI);
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ let promiseTab = BrowserTestUtils.waitForNewTab(gBrowser, DATA_URI_SOURCE);
|
|
|
+ BrowserViewSource(tab.linkedBrowser);
|
|
|
+ let viewSourceTab = await promiseTab;
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await BrowserTestUtils.removeTab(viewSourceTab);
|
|
|
++ BrowserTestUtils.removeTab(viewSourceTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ let dummyPage = getChromeDir(getResolvedURI(gTestPath));
|
|
|
+ dummyPage.append(DUMMY_FILE);
|
|
|
+ const uriString = Services.io.newFileURI(dummyPage).spec;
|
|
|
+
|
|
|
+ let viewSourceBrowser = viewSourceTab.linkedBrowser;
|
|
|
+ let promiseLoad =
|
|
|
+diff --git a/browser/base/content/test/tabs/browser_contextmenu_openlink_after_tabnavigated.js b/browser/base/content/test/tabs/browser_contextmenu_openlink_after_tabnavigated.js
|
|
|
+--- a/browser/base/content/test/tabs/browser_contextmenu_openlink_after_tabnavigated.js
|
|
|
++++ b/browser/base/content/test/tabs/browser_contextmenu_openlink_after_tabnavigated.js
|
|
|
+@@ -33,11 +33,11 @@ add_task(async function test_contextmenu
|
|
|
+ contextMenu.hidePopup();
|
|
|
+
|
|
|
+ await BrowserTestUtils.browserLoaded(newTab.linkedBrowser);
|
|
|
+ const newTabURL = await ContentTask.spawn(newTab.linkedBrowser, null, async function() {
|
|
|
+ return content.location.href;
|
|
|
+ });
|
|
|
+ is(newTabURL, "http://example.com/", "Got the expected URL loaded in the new tab");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/tabs/browser_navigatePinnedTab.js b/browser/base/content/test/tabs/browser_navigatePinnedTab.js
|
|
|
+--- a/browser/base/content/test/tabs/browser_navigatePinnedTab.js
|
|
|
++++ b/browser/base/content/test/tabs/browser_navigatePinnedTab.js
|
|
|
+@@ -44,15 +44,15 @@ add_task(async function() {
|
|
|
+ link.click();
|
|
|
+ });
|
|
|
+ info("Created & clicked link");
|
|
|
+ let extraTab = await newTabPromise;
|
|
|
+ info("Got a new tab");
|
|
|
+ await ContentTask.spawn(extraTab.linkedBrowser, null, async function() {
|
|
|
+ is(content.opener, null, "No opener should be available");
|
|
|
+ });
|
|
|
+- await BrowserTestUtils.removeTab(extraTab);
|
|
|
++ BrowserTestUtils.removeTab(extraTab);
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
+ registerCleanupFunction(function() {
|
|
|
+ gBrowser.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/tabs/browser_new_web_tab_in_file_process_pref.js b/browser/base/content/test/tabs/browser_new_web_tab_in_file_process_pref.js
|
|
|
+--- a/browser/base/content/test/tabs/browser_new_web_tab_in_file_process_pref.js
|
|
|
++++ b/browser/base/content/test/tabs/browser_new_web_tab_in_file_process_pref.js
|
|
|
+@@ -39,17 +39,17 @@ add_task(async function() {
|
|
|
+ // Check that http tab opened from JS in file:// page is in same process.
|
|
|
+ let promiseTabOpened = BrowserTestUtils.waitForNewTab(gBrowser, TEST_HTTP, true);
|
|
|
+ await ContentTask.spawn(fileBrowser, TEST_HTTP, uri => {
|
|
|
+ content.open(uri, "_blank");
|
|
|
+ });
|
|
|
+ let httpTab = await promiseTabOpened;
|
|
|
+ let httpBrowser = httpTab.linkedBrowser;
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await BrowserTestUtils.removeTab(httpTab);
|
|
|
++ BrowserTestUtils.removeTab(httpTab);
|
|
|
+ });
|
|
|
+ await CheckBrowserInPid(httpBrowser, filePid,
|
|
|
+ "Check that new http tab opened from file loaded in file content process.");
|
|
|
+
|
|
|
+ // Check that reload doesn't break the file content process affinity.
|
|
|
+ if (httpTab != gBrowser.selectedTab) {
|
|
|
+ httpTab = await BrowserTestUtils.switchTab(gBrowser, httpTab);
|
|
|
+ httpBrowser = httpTab.linkedBrowser;
|
|
|
+diff --git a/browser/base/content/test/tabs/browser_open_newtab_start_observer_notification.js b/browser/base/content/test/tabs/browser_open_newtab_start_observer_notification.js
|
|
|
+--- a/browser/base/content/test/tabs/browser_open_newtab_start_observer_notification.js
|
|
|
++++ b/browser/base/content/test/tabs/browser_open_newtab_start_observer_notification.js
|
|
|
+@@ -13,10 +13,10 @@ add_task(async function test_browser_ope
|
|
|
+ // because we want to be sure that it triggers the event to fire, since
|
|
|
+ // it's very close to where various user-actions are triggered.
|
|
|
+ BrowserOpenTab();
|
|
|
+ await observerFiredPromise;
|
|
|
+ const tab = gBrowser.selectedTab;
|
|
|
+
|
|
|
+ ok(true, "browser-open-newtab-start observer not called");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/tabs/browser_opened_file_tab_navigated_to_web.js b/browser/base/content/test/tabs/browser_opened_file_tab_navigated_to_web.js
|
|
|
+--- a/browser/base/content/test/tabs/browser_opened_file_tab_navigated_to_web.js
|
|
|
++++ b/browser/base/content/test/tabs/browser_opened_file_tab_navigated_to_web.js
|
|
|
+@@ -8,28 +8,28 @@ add_task(async function() {
|
|
|
+ let dir = getChromeDir(getResolvedURI(gTestPath));
|
|
|
+ dir.append(TEST_FILE);
|
|
|
+ const uriString = Services.io.newFileURI(dir).spec;
|
|
|
+ const openedUriString = uriString + "?opened";
|
|
|
+
|
|
|
+ // Open first file:// page.
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, uriString);
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Open new file:// tab from JavaScript in first file:// page.
|
|
|
+ let promiseTabOpened = BrowserTestUtils.waitForNewTab(gBrowser, openedUriString);
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, openedUriString, uri => {
|
|
|
+ content.open(uri, "_blank");
|
|
|
+ });
|
|
|
+
|
|
|
+ let openedTab = await promiseTabOpened;
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await BrowserTestUtils.removeTab(openedTab);
|
|
|
++ BrowserTestUtils.removeTab(openedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ let openedBrowser = openedTab.linkedBrowser;
|
|
|
+ await BrowserTestUtils.browserLoaded(openedBrowser);
|
|
|
+
|
|
|
+ // Ensure that new file:// tab can be navigated to web content.
|
|
|
+ openedBrowser.loadURI("http://example.org/");
|
|
|
+ let href = await BrowserTestUtils.browserLoaded(openedBrowser);
|
|
|
+diff --git a/browser/base/content/test/tabs/browser_overflowScroll.js.1442465-4_2.later b/browser/base/content/test/tabs/browser_overflowScroll.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/tabs/browser_overflowScroll.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,15 @@
|
|
|
++--- browser_overflowScroll.js
|
|
|
+++++ browser_overflowScroll.js
|
|
|
++@@ -74,11 +74,11 @@ add_task(async function() {
|
|
|
++ isLeft(element, "Scrolled one page of tabs with a double click");
|
|
|
++
|
|
|
++ EventUtils.synthesizeMouseAtCenter(upButton, {clickCount: 3});
|
|
|
++ var firstScrollableLeft = left(firstScrollable());
|
|
|
++ ok(left(scrollbox) <= firstScrollableLeft, "Scrolled to the start with a triple click " +
|
|
|
++ "(" + left(scrollbox) + " <= " + firstScrollableLeft + ")");
|
|
|
++
|
|
|
++ while (tabs.length > 1) {
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.tabs[0]);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.tabs[0]);
|
|
|
++ }
|
|
|
++ });
|
|
|
+diff --git a/browser/base/content/test/tabs/browser_preloadedBrowser_zoom.js.1442465-4_2.later b/browser/base/content/test/tabs/browser_preloadedBrowser_zoom.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/tabs/browser_preloadedBrowser_zoom.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_preloadedBrowser_zoom.js
|
|
|
+++++ browser_preloadedBrowser_zoom.js
|
|
|
++@@ -31,17 +31,17 @@ add_task(async function test_default_zoo
|
|
|
++
|
|
|
++ /**
|
|
|
++ * Helper to open about:newtab and zoom then check matching preloaded zoom
|
|
|
++ */
|
|
|
++ async function zoomNewTab(changeZoom, message) {
|
|
|
++ const tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:newtab");
|
|
|
++ changeZoom();
|
|
|
++ const level = tab.linkedBrowser.fullZoom;
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++
|
|
|
++ await checkPreloadedZoom(level, `${message}: ${level}`);
|
|
|
++ }
|
|
|
++
|
|
|
++ add_task(async function test_preloaded_zoom_out() {
|
|
|
++ await zoomNewTab(() => FullZoom.reduce(), "zoomed out applied to preloaded");
|
|
|
++ });
|
|
|
++
|
|
|
+diff --git a/browser/base/content/test/tabs/browser_reload_deleted_file.js b/browser/base/content/test/tabs/browser_reload_deleted_file.js
|
|
|
+--- a/browser/base/content/test/tabs/browser_reload_deleted_file.js
|
|
|
++++ b/browser/base/content/test/tabs/browser_reload_deleted_file.js
|
|
|
+@@ -15,17 +15,17 @@ add_task(async function() {
|
|
|
+ let uniqueName = uuidGenerator.generateUUID().toString();
|
|
|
+ dummyPage.copyTo(disappearingPage, uniqueName);
|
|
|
+ disappearingPage.append(uniqueName);
|
|
|
+
|
|
|
+ // Get file:// URI for new page and load in a new tab.
|
|
|
+ const uriString = Services.io.newFileURI(disappearingPage).spec;
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, uriString);
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Delete the page, simulate a click of the reload button and check that we
|
|
|
+ // get a neterror page.
|
|
|
+ disappearingPage.remove(false);
|
|
|
+ document.getElementById("reload-button").doCommand();
|
|
|
+ await BrowserTestUtils.waitForErrorPage(tab.linkedBrowser);
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, null, function() {
|
|
|
+diff --git a/browser/base/content/test/tabs/browser_tabSpinnerProbe.js b/browser/base/content/test/tabs/browser_tabSpinnerProbe.js
|
|
|
+--- a/browser/base/content/test/tabs/browser_tabSpinnerProbe.js
|
|
|
++++ b/browser/base/content/test/tabs/browser_tabSpinnerProbe.js
|
|
|
+@@ -72,17 +72,17 @@ async function testProbe(aProbe) {
|
|
|
+ let tabHangPromise = hangContentProcess(hangBrowser, delayTime);
|
|
|
+ histogram.clear();
|
|
|
+ let hangTabSwitch = BrowserTestUtils.switchTab(gBrowser, hangTab);
|
|
|
+ await tabHangPromise;
|
|
|
+ await hangTabSwitch;
|
|
|
+
|
|
|
+ // Now we should have a hang in our histogram.
|
|
|
+ let snapshot = histogram.snapshot();
|
|
|
+- await BrowserTestUtils.removeTab(hangTab);
|
|
|
++ BrowserTestUtils.removeTab(hangTab);
|
|
|
+ ok(sum(snapshot.counts) > 0,
|
|
|
+ `Spinner probe should now have a value in some bucket`);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function setup() {
|
|
|
+ await SpecialPowers.pushPrefEnv({
|
|
|
+ set: [
|
|
|
+ ["dom.ipc.processCount", 1],
|
|
|
+diff --git a/browser/base/content/test/tabs/browser_tabSwitchPrintPreview.js b/browser/base/content/test/tabs/browser_tabSwitchPrintPreview.js
|
|
|
+--- a/browser/base/content/test/tabs/browser_tabSwitchPrintPreview.js
|
|
|
++++ b/browser/base/content/test/tabs/browser_tabSwitchPrintPreview.js
|
|
|
+@@ -17,11 +17,11 @@ add_task(async function() {
|
|
|
+ is(gBrowser.selectedTab, PrintPreviewListener._printPreviewTab, "Selected tab should be the print preview tab");
|
|
|
+ gBrowser.selectedTab = tab;
|
|
|
+ isnot(gBrowser.selectedTab, tab, "Selected tab should still not be the tab we added");
|
|
|
+ is(gBrowser.selectedTab, PrintPreviewListener._printPreviewTab, "Selected tab should still be the print preview tab");
|
|
|
+ let tabSwitched = BrowserTestUtils.switchTab(gBrowser, () => { PrintUtils.exitPrintPreview(); });
|
|
|
+ await BrowserTestUtils.waitForCondition(() => !gInPrintPreviewMode, "should no longer be in print preview mode");
|
|
|
+ await tabSwitched;
|
|
|
+ is(gBrowser.selectedTab, originalTab, "Selected tab should be back to the original tab that we print previewed");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/tabs/browser_tabswitch_updatecommands.js b/browser/base/content/test/tabs/browser_tabswitch_updatecommands.js
|
|
|
+--- a/browser/base/content/test/tabs/browser_tabswitch_updatecommands.js
|
|
|
++++ b/browser/base/content/test/tabs/browser_tabswitch_updatecommands.js
|
|
|
+@@ -11,11 +11,11 @@ add_task(async function() {
|
|
|
+ function countUpdates(event) { updates++; }
|
|
|
+ let updater = document.getElementById("editMenuCommandSetAll");
|
|
|
+ updater.addEventListener("commandupdate", countUpdates, true);
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, tab1);
|
|
|
+
|
|
|
+ is(updates, 1, "only one command update per tab switch");
|
|
|
+
|
|
|
+ updater.removeEventListener("commandupdate", countUpdates, true);
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/tabs/browser_viewsource_of_data_URI_in_file_process.js b/browser/base/content/test/tabs/browser_viewsource_of_data_URI_in_file_process.js
|
|
|
+--- a/browser/base/content/test/tabs/browser_viewsource_of_data_URI_in_file_process.js
|
|
|
++++ b/browser/base/content/test/tabs/browser_viewsource_of_data_URI_in_file_process.js
|
|
|
+@@ -28,16 +28,16 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+ is(dataPid, filePid, "Check that data URI loaded in file content process.");
|
|
|
+
|
|
|
+ // Make sure we can view-source on the data URI page.
|
|
|
+ let promiseTab = BrowserTestUtils.waitForNewTab(gBrowser, DATA_URI_SOURCE);
|
|
|
+ BrowserViewSource(fileBrowser);
|
|
|
+ let viewSourceTab = await promiseTab;
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await BrowserTestUtils.removeTab(viewSourceTab);
|
|
|
++ BrowserTestUtils.removeTab(viewSourceTab);
|
|
|
+ });
|
|
|
+ await ContentTask.spawn(viewSourceTab.linkedBrowser, DATA_URI_SOURCE, uri => {
|
|
|
+ is(content.document.documentURI, uri,
|
|
|
+ "Check that a view-source page was loaded.");
|
|
|
+ });
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_action_keyword.js b/browser/base/content/test/urlbar/browser_action_keyword.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_action_keyword.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_action_keyword.js
|
|
|
+@@ -12,17 +12,17 @@ add_task(async function setup() {
|
|
|
+ url: TEST_URL + "?q=%s" });
|
|
|
+ await PlacesUtils.keywords.insert({ keyword: "post",
|
|
|
+ url: TEST_URL,
|
|
|
+ postData: "q=%s" });
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+ await PlacesUtils.keywords.remove("get");
|
|
|
+ await PlacesUtils.keywords.remove("post");
|
|
|
+ while (gBrowser.tabs.length > 1) {
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function get_keyword() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:mozilla");
|
|
|
+
|
|
|
+ let result = await promise_first_result("get something");
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_action_searchengine.js.1442465-4_2.later b/browser/base/content/test/urlbar/browser_action_searchengine.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/urlbar/browser_action_searchengine.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_action_searchengine.js
|
|
|
+++++ browser_action_searchengine.js
|
|
|
++@@ -9,17 +9,17 @@ add_task(async function() {
|
|
|
++ Services.search.currentEngine = engine;
|
|
|
++
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:mozilla");
|
|
|
++
|
|
|
++ registerCleanupFunction(async function() {
|
|
|
++ Services.search.currentEngine = originalEngine;
|
|
|
++ Services.search.removeEngine(engine);
|
|
|
++ try {
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ } catch (ex) { /* tab may have already been closed in case of failure */ }
|
|
|
++ await PlacesUtils.history.clear();
|
|
|
++ });
|
|
|
++
|
|
|
++ await promiseAutocompleteResultPopup("open a search");
|
|
|
++ let result = await waitForAutocompleteResultAt(0);
|
|
|
++ isnot(result, null, "Should have a result");
|
|
|
++ is(result.getAttribute("url"),
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_action_searchengine_alias.js.1442465-4_2.later b/browser/base/content/test/urlbar/browser_action_searchengine_alias.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/urlbar/browser_action_searchengine_alias.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_action_searchengine_alias.js
|
|
|
+++++ browser_action_searchengine_alias.js
|
|
|
++@@ -10,17 +10,17 @@ add_task(async function() {
|
|
|
++ Services.search.currentEngine = engine;
|
|
|
++
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:mozilla");
|
|
|
++
|
|
|
++ registerCleanupFunction(async function() {
|
|
|
++ Services.search.currentEngine = originalEngine;
|
|
|
++ Services.search.removeEngine(engine);
|
|
|
++ try {
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ } catch (ex) { /* tab may have already been closed in case of failure */ }
|
|
|
++ await PlacesUtils.history.clear();
|
|
|
++ });
|
|
|
++
|
|
|
++ await promiseAutocompleteResultPopup("moz open a search");
|
|
|
++ let result = await waitForAutocompleteResultAt(0);
|
|
|
++ ok(result.hasAttribute("image"), "Result should have an image attribute");
|
|
|
++ ok(result.getAttribute("image") === engine.iconURI.spec,
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_autocomplete_autoselect.js.1442465-4_2.later b/browser/base/content/test/urlbar/browser_autocomplete_autoselect.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/urlbar/browser_autocomplete_autoselect.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_autocomplete_autoselect.js
|
|
|
+++++ browser_autocomplete_autoselect.js
|
|
|
++@@ -30,17 +30,17 @@ function is_selected_one_off(index) {
|
|
|
++
|
|
|
++ add_task(async function() {
|
|
|
++ let maxResults = Services.prefs.getIntPref("browser.urlbar.maxRichResults");
|
|
|
++ Services.prefs.setBoolPref(ONEOFF_URLBAR_PREF, true);
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:mozilla");
|
|
|
++ registerCleanupFunction(async function() {
|
|
|
++ await PlacesUtils.history.clear();
|
|
|
++ Services.prefs.clearUserPref(ONEOFF_URLBAR_PREF);
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ let visits = [];
|
|
|
++ repeat(maxResults, i => {
|
|
|
++ visits.push({
|
|
|
++ uri: makeURI("http://example.com/autocomplete/?" + i),
|
|
|
++ });
|
|
|
++ });
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_autocomplete_cursor.js.1442465-4_2.later b/browser/base/content/test/urlbar/browser_autocomplete_cursor.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/urlbar/browser_autocomplete_cursor.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,14 @@
|
|
|
++--- browser_autocomplete_cursor.js
|
|
|
+++++ browser_autocomplete_cursor.js
|
|
|
++@@ -11,10 +11,10 @@ add_task(async function() {
|
|
|
++ is(gURLBar.popup.richlistbox.selectedIndex, 0, "Should have selected something");
|
|
|
++
|
|
|
++ EventUtils.synthesizeKey("KEY_ArrowRight");
|
|
|
++ await promisePopupHidden(gURLBar.popup);
|
|
|
++
|
|
|
++ is(gURLBar.selectionStart, 5, "Should have moved the cursor");
|
|
|
++ is(gURLBar.selectionEnd, 5, "And not selected anything");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_autocomplete_edit_completed.js.1442465-4_2.later b/browser/base/content/test/urlbar/browser_autocomplete_edit_completed.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/urlbar/browser_autocomplete_edit_completed.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_autocomplete_edit_completed.js
|
|
|
+++++ browser_autocomplete_edit_completed.js
|
|
|
++@@ -3,17 +3,17 @@ add_task(async function() {
|
|
|
++
|
|
|
++ await PlacesTestUtils.addVisits([
|
|
|
++ { uri: makeURI("http://example.com/foo") },
|
|
|
++ { uri: makeURI("http://example.com/foo/bar") },
|
|
|
++ ]);
|
|
|
++
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank");
|
|
|
++ registerCleanupFunction(async function() {
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ await PlacesUtils.history.clear();
|
|
|
++ });
|
|
|
++
|
|
|
++ await promiseAutocompleteResultPopup("http://example.com");
|
|
|
++ await waitForAutocompleteResultAt(1);
|
|
|
++
|
|
|
++ let popup = gURLBar.popup;
|
|
|
++ let list = popup.richlistbox;
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_autocomplete_enter_race.js b/browser/base/content/test/urlbar/browser_autocomplete_enter_race.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_autocomplete_enter_race.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_autocomplete_enter_race.js
|
|
|
+@@ -2,17 +2,17 @@
|
|
|
+
|
|
|
+ add_task(async function setup() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
|
|
|
+ let bm = await PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
|
|
|
+ url: "http://example.com/?q=%s",
|
|
|
+ title: "test" });
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+ await PlacesUtils.bookmarks.remove(bm);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ await PlacesUtils.keywords.insert({ keyword: "keyword",
|
|
|
+ url: "http://example.com/?q=%s" });
|
|
|
+ // Needs at least one success.
|
|
|
+ ok(true, "Setup complete");
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_keyword() {
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_autocomplete_no_title.js.1442465-4_2.later b/browser/base/content/test/urlbar/browser_autocomplete_no_title.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/urlbar/browser_autocomplete_no_title.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,20 @@
|
|
|
++--- browser_autocomplete_no_title.js
|
|
|
+++++ browser_autocomplete_no_title.js
|
|
|
++@@ -1,16 +1,16 @@
|
|
|
++ add_task(async function() {
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:mozilla");
|
|
|
++ await PlacesUtils.history.clear();
|
|
|
++ const uri = "http://bug1060642.example.com/beards/are/pretty/great";
|
|
|
++ await PlacesTestUtils.addVisits([{ uri, title: "" }]);
|
|
|
++ registerCleanupFunction(async function() {
|
|
|
++ await PlacesUtils.history.clear();
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ await promiseAutocompleteResultPopup("bug1060642");
|
|
|
++ let result = await waitForAutocompleteResultAt(1);
|
|
|
++ is(result._titleText.textContent, "bug1060642.example.com", "Result title should be as expected");
|
|
|
++
|
|
|
++ gURLBar.popup.hidePopup();
|
|
|
++ await promisePopupHidden(gURLBar.popup);
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_dragdropURL.js b/browser/base/content/test/urlbar/browser_dragdropURL.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_dragdropURL.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_dragdropURL.js
|
|
|
+@@ -5,17 +5,17 @@ const DRAG_URL = "http://www.example.com
|
|
|
+ const DRAG_FORBIDDEN_URL = "chrome://browser/content/aboutDialog.xul";
|
|
|
+ const DRAG_TEXT = "Firefox is awesome";
|
|
|
+ const DRAG_TEXT_URL = "http://example.com/?q=Firefox+is+awesome";
|
|
|
+ const DRAG_WORD = "Firefox";
|
|
|
+ const DRAG_WORD_URL = "http://example.com/?q=Firefox";
|
|
|
+
|
|
|
+ registerCleanupFunction(async function cleanup() {
|
|
|
+ while (gBrowser.tabs.length > 1) {
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
|
|
|
+ }
|
|
|
+ Services.search.currentEngine = originalEngine;
|
|
|
+ let engine = Services.search.getEngineByName("MozSearch");
|
|
|
+ Services.search.removeEngine(engine);
|
|
|
+ });
|
|
|
+
|
|
|
+ let originalEngine;
|
|
|
+ add_task(async function test_setup() {
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_moz_action_link.js b/browser/base/content/test/urlbar/browser_moz_action_link.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_moz_action_link.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_moz_action_link.js
|
|
|
+@@ -20,12 +20,12 @@ add_task(async function() {
|
|
|
+ let newTab = gBrowser.selectedTab;
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, tab);
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, newTab);
|
|
|
+ is(gBrowser.selectedTab, newTab, "Switched to new tab again!");
|
|
|
+ is(gURLBar.value, "about:blank", "URL bar should be displaying about:blank after tab switch");
|
|
|
+ // Finally, check that directly setting it produces the right results, too:
|
|
|
+ URLBarSetURI(makeURI(uri));
|
|
|
+ is(gURLBar.value, "about:blank", "URL bar should still be displaying about:blank");
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_new_tab_urlbar_reset.js b/browser/base/content/test/urlbar/browser_new_tab_urlbar_reset.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_new_tab_urlbar_reset.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_new_tab_urlbar_reset.js
|
|
|
+@@ -6,11 +6,11 @@
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank", false);
|
|
|
+ await promiseAutocompleteResultPopup("m");
|
|
|
+ ok(gURLBar.popupOpen, "The popup is open");
|
|
|
+ let tab2 = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank", false);
|
|
|
+ await promiseAutocompleteResultPopup("m");
|
|
|
+ ok(gURLBar.popupOpen, "The popup is open");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar.js b/browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar.js
|
|
|
+@@ -69,33 +69,33 @@ add_task(async function step_4() {
|
|
|
+ });
|
|
|
+
|
|
|
+ await ensure_opentabs_match_db();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function step_5() {
|
|
|
+ info("Running step 5 - remove tab immediately");
|
|
|
+ let tab = BrowserTestUtils.addTab(gBrowser, "about:logo");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await ensure_opentabs_match_db();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function step_6() {
|
|
|
+ info("Running step 6 - check swapBrowsersAndCloseOther preserves registered switch-to-tab result");
|
|
|
+ let tabToKeep = BrowserTestUtils.addTab(gBrowser);
|
|
|
+ let tab = BrowserTestUtils.addTab(gBrowser);
|
|
|
+ tab.linkedBrowser.loadURI("about:mozilla");
|
|
|
+ await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
|
|
|
+
|
|
|
+ gBrowser.updateBrowserRemoteness(tabToKeep.linkedBrowser, tab.linkedBrowser.isRemoteBrowser);
|
|
|
+ gBrowser.swapBrowsersAndCloseOther(tabToKeep, tab);
|
|
|
+
|
|
|
+ await ensure_opentabs_match_db();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tabToKeep);
|
|
|
++ BrowserTestUtils.removeTab(tabToKeep);
|
|
|
+
|
|
|
+ await ensure_opentabs_match_db();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function step_7() {
|
|
|
+ info("Running step 7 - close all tabs");
|
|
|
+
|
|
|
+ Services.prefs.clearUserPref("browser.sessionstore.restore_on_demand");
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_urlbarAboutHomeLoading.js b/browser/base/content/test/urlbar/browser_urlbarAboutHomeLoading.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_urlbarAboutHomeLoading.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_urlbarAboutHomeLoading.js
|
|
|
+@@ -14,17 +14,17 @@ add_task(async function clearURLBarAfter
|
|
|
+ newTabBrowser.addEventListener("Initialized", function() {
|
|
|
+ resolve(gBrowser.selectedTab);
|
|
|
+ }, {capture: true, once: true});
|
|
|
+ });
|
|
|
+ document.getElementById("home-button").click();
|
|
|
+ await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
|
|
|
+ is(gURLBar.value, "", "URL bar should be empty");
|
|
|
+ is(tab.linkedBrowser.userTypedValue, null, "The browser should have no recorded userTypedValue");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Same as above, but open the tab without passing the URL immediately
|
|
|
+ * which changes behaviour in tabbrowser.xml.
|
|
|
+ */
|
|
|
+ add_task(async function clearURLBarAfterParentProcessURLInExistingTab() {
|
|
|
+ let tab = await new Promise(resolve => {
|
|
|
+@@ -34,17 +34,17 @@ add_task(async function clearURLBarAfter
|
|
|
+ resolve(gBrowser.selectedTab);
|
|
|
+ }, {capture: true, once: true});
|
|
|
+ newTabBrowser.loadURI("about:preferences");
|
|
|
+ });
|
|
|
+ document.getElementById("home-button").click();
|
|
|
+ await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
|
|
|
+ is(gURLBar.value, "", "URL bar should be empty");
|
|
|
+ is(tab.linkedBrowser.userTypedValue, null, "The browser should have no recorded userTypedValue");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Load about:home directly from an about:newtab page. Because it is an
|
|
|
+ * 'initial' page, we need to treat this specially if the user actually
|
|
|
+ * loads a page like this from the URL bar.
|
|
|
+ */
|
|
|
+ add_task(async function clearURLBarAfterManuallyLoadingAboutHome() {
|
|
|
+@@ -58,17 +58,17 @@ add_task(async function clearURLBarAfter
|
|
|
+ gURLBar.value = "about:home";
|
|
|
+ gURLBar.select();
|
|
|
+ let aboutHomeLoaded = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false, "about:home");
|
|
|
+ EventUtils.sendKey("return");
|
|
|
+ await aboutHomeLoaded;
|
|
|
+
|
|
|
+ is(gURLBar.value, "", "URL bar should be empty");
|
|
|
+ is(tab.linkedBrowser.userTypedValue, null, "userTypedValue should be null");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Ensure we don't show 'about:home' in the URL bar temporarily in new tabs
|
|
|
+ * while we're switching remoteness (when the URL we're loading and the
|
|
|
+ * default content principal are different).
|
|
|
+ */
|
|
|
+ add_task(async function dontTemporarilyShowAboutHome() {
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_urlbarEnter.js b/browser/base/content/test/urlbar/browser_urlbarEnter.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_urlbarEnter.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_urlbarEnter.js
|
|
|
+@@ -14,17 +14,17 @@ add_task(async function() {
|
|
|
+ EventUtils.synthesizeKey("KEY_Enter");
|
|
|
+ await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
|
|
|
+
|
|
|
+ // Check url bar and selected tab.
|
|
|
+ is(gURLBar.textValue, TEST_VALUE, "Urlbar should preserve the value on return keypress");
|
|
|
+ is(gBrowser.selectedTab, tab, "New URL was loaded in the current tab");
|
|
|
+
|
|
|
+ // Cleanup.
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ info("Alt+Return keypress");
|
|
|
+ // due to bug 691608, we must wait for the load event, else isTabEmpty() will
|
|
|
+ // return true on e10s for this tab, so it will be reused even with altKey.
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, START_VALUE);
|
|
|
+
|
|
|
+@@ -35,11 +35,11 @@ add_task(async function() {
|
|
|
+ // wait for the new tab to appear.
|
|
|
+ await tabOpenPromise;
|
|
|
+
|
|
|
+ // Check url bar and selected tab.
|
|
|
+ is(gURLBar.textValue, TEST_VALUE, "Urlbar should preserve the value on return keypress");
|
|
|
+ isnot(gBrowser.selectedTab, tab, "New URL was loaded in a new tab");
|
|
|
+
|
|
|
+ // Cleanup.
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_urlbarHashChangeProxyState.js b/browser/base/content/test/urlbar/browser_urlbarHashChangeProxyState.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_urlbarHashChangeProxyState.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_urlbarHashChangeProxyState.js
|
|
|
+@@ -101,11 +101,11 @@ add_task(async function() {
|
|
|
+
|
|
|
+ is(gURLBar.textValue, url, "URL bar visible value should be correct when the page loads from about:newtab");
|
|
|
+ is(gURLBar.value, url, "URL bar value should be correct when the page loads from about:newtab");
|
|
|
+ let identityBox = document.getElementById("identity-box");
|
|
|
+ ok(identityBox.classList.contains("verifiedDomain"),
|
|
|
+ "Identity box should know we're doing SSL when the page loads from about:newtab");
|
|
|
+ is(gURLBar.getAttribute("pageproxystate"), "valid",
|
|
|
+ "URL bar is in valid page proxy state when SSL page with hash loads from about:newtab");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_urlbarKeepStateAcrossTabSwitches.js b/browser/base/content/test/urlbar/browser_urlbarKeepStateAcrossTabSwitches.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_urlbarKeepStateAcrossTabSwitches.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_urlbarKeepStateAcrossTabSwitches.js
|
|
|
+@@ -14,17 +14,17 @@ add_task(async function() {
|
|
|
+ gURLBar.value = input;
|
|
|
+ gURLBar.select();
|
|
|
+ EventUtils.sendKey("return");
|
|
|
+ await errorPageLoaded;
|
|
|
+ is(gURLBar.textValue, input, "Text is still in URL bar");
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, tab.previousSibling);
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, tab);
|
|
|
+ is(gURLBar.textValue, input, "Text is still in URL bar after tab switch");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Invalid URIs fail differently (that is, immediately, in the loadURI call)
|
|
|
+ * if keyword searches are turned off. Test that this works, too.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ let input = "To be or not to be-that is the question";
|
|
|
+@@ -39,11 +39,11 @@ add_task(async function() {
|
|
|
+ EventUtils.sendKey("return");
|
|
|
+ await errorPageLoaded;
|
|
|
+ is(gURLBar.textValue, input, "Text is still in URL bar");
|
|
|
+ is(tab.linkedBrowser.userTypedValue, input, "Text still stored on browser");
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, tab.previousSibling);
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, tab);
|
|
|
+ is(gURLBar.textValue, input, "Text is still in URL bar after tab switch");
|
|
|
+ is(tab.linkedBrowser.userTypedValue, input, "Text still stored on browser");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_urlbarOneOffs_searchSuggestions.js b/browser/base/content/test/urlbar/browser_urlbarOneOffs_searchSuggestions.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_urlbarOneOffs_searchSuggestions.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_urlbarOneOffs_searchSuggestions.js
|
|
|
+@@ -45,17 +45,17 @@ add_task(async function oneOffReturnAfte
|
|
|
+
|
|
|
+ let resultsPromise =
|
|
|
+ BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false,
|
|
|
+ `http://mochi.test:8888/?terms=foobar`);
|
|
|
+ EventUtils.synthesizeKey("KEY_Enter");
|
|
|
+ await resultsPromise;
|
|
|
+
|
|
|
+ await PlacesTestUtils.clearHistory();
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Clicks a one-off engine after selecting a search suggestion.
|
|
|
+ add_task(async function oneOffClickAfterSuggestion() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
|
|
|
+
|
|
|
+ let typedValue = "foo";
|
|
|
+ await promiseAutocompleteResultPopup(typedValue, window, true);
|
|
|
+@@ -74,17 +74,17 @@ add_task(async function oneOffClickAfter
|
|
|
+ let oneOffs = gURLBar.popup.oneOffSearchButtons.getSelectableButtons(true);
|
|
|
+ let resultsPromise =
|
|
|
+ BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false,
|
|
|
+ `http://mochi.test:8888/?terms=foobar`);
|
|
|
+ EventUtils.synthesizeMouseAtCenter(oneOffs[0], {});
|
|
|
+ await resultsPromise;
|
|
|
+
|
|
|
+ await PlacesTestUtils.clearHistory();
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function overridden_engine_not_reused() {
|
|
|
+ info("An overridden search suggestion item should not be reused by a search with another engine");
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
|
|
|
+ let typedValue = "foo";
|
|
|
+ await promiseAutocompleteResultPopup(typedValue, window, true);
|
|
|
+ await BrowserTestUtils.waitForCondition(suggestionsPresent,
|
|
|
+@@ -101,17 +101,17 @@ add_task(async function overridden_engin
|
|
|
+ // Run again the query, check the label has been replaced.
|
|
|
+ await promiseAutocompleteResultPopup(typedValue, window, true);
|
|
|
+ await BrowserTestUtils.waitForCondition(suggestionsPresent,
|
|
|
+ "waiting for suggestions");
|
|
|
+ assertState(0, -1, "foo");
|
|
|
+ let newLabel = gURLBar.popup.richlistbox.children[1].label;
|
|
|
+ Assert.notEqual(newLabel, label, "The label should have been updated");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ function assertState(result, oneOff, textValue = undefined) {
|
|
|
+ Assert.equal(gURLBar.popup.selectedIndex, result,
|
|
|
+ "Expected result should be selected");
|
|
|
+ Assert.equal(gURLBar.popup.oneOffSearchButtons.selectedButtonIndex, oneOff,
|
|
|
+ "Expected one-off should be selected");
|
|
|
+ if (textValue !== undefined) {
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_urlbarRaceWithTabs.js b/browser/base/content/test/urlbar/browser_urlbarRaceWithTabs.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_urlbarRaceWithTabs.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_urlbarRaceWithTabs.js
|
|
|
+@@ -45,13 +45,13 @@ add_task(async function hitEnterLoadInRi
|
|
|
+ let newTab = (await newTabCreatedPromise).target;
|
|
|
+ info("Created new tab; waiting for either tab to load");
|
|
|
+ let newTabLoadedPromise = BrowserTestUtils.browserLoaded(newTab.linkedBrowser, false, kURL);
|
|
|
+ newTabLoadedPromise.then(() => info("New tab loaded"));
|
|
|
+ await Promise.race([newTabLoadedPromise, oldTabLoadedPromise]);
|
|
|
+ is(newTab.linkedBrowser.currentURI.spec, "about:newtab", "New tab still has about:newtab");
|
|
|
+ is(oldTab.linkedBrowser.currentURI.spec, kURL, "Old tab loaded URL");
|
|
|
+ info("Closing new tab");
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ info("Closing old tab");
|
|
|
+- await BrowserTestUtils.removeTab(oldTab);
|
|
|
++ BrowserTestUtils.removeTab(oldTab);
|
|
|
+ info("Finished");
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions.js b/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions.js
|
|
|
+@@ -32,17 +32,17 @@ add_task(async function clickSuggestion(
|
|
|
+ "Expected suggestion engine");
|
|
|
+ let item = gURLBar.popup.richlistbox.getItemAtIndex(idx);
|
|
|
+
|
|
|
+ let uri = Services.search.currentEngine.getSubmission(suggestion).uri;
|
|
|
+ let loadPromise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser,
|
|
|
+ false, uri.spec);
|
|
|
+ item.click();
|
|
|
+ await loadPromise;
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ async function testPressEnterOnSuggestion(expectedUrl = null, keyModifiers = {}) {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
|
|
|
+ gURLBar.focus();
|
|
|
+ await promiseAutocompleteResultPopup("foo");
|
|
|
+ let [idx, suggestion, engineName] = await promiseFirstSuggestion();
|
|
|
+ Assert.equal(engineName,
|
|
|
+@@ -56,17 +56,17 @@ async function testPressEnterOnSuggestio
|
|
|
+ let promiseLoad = waitForDocLoadAndStopIt(expectedUrl);
|
|
|
+
|
|
|
+ for (let i = 0; i < idx; ++i) {
|
|
|
+ EventUtils.synthesizeKey("KEY_ArrowDown");
|
|
|
+ }
|
|
|
+ EventUtils.synthesizeKey("KEY_Enter", keyModifiers);
|
|
|
+
|
|
|
+ await promiseLoad;
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function plainEnterOnSuggestion() {
|
|
|
+ await testPressEnterOnSuggestion();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function ctrlEnterOnSuggestion() {
|
|
|
+ await testPressEnterOnSuggestion("http://www.foofoo.com/",
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js b/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js
|
|
|
+@@ -70,17 +70,17 @@ add_task(async function new_tab() {
|
|
|
+ let popupPromise = promisePopupShown(gURLBar.popup);
|
|
|
+ // openNewForegroundTab doesn't focus the urlbar.
|
|
|
+ await BrowserTestUtils.synthesizeKey("t", { accelKey: true }, gBrowser.selectedBrowser);
|
|
|
+ await popupPromise;
|
|
|
+ Assert.ok(gURLBar.popup.popupOpen, "popup should be open");
|
|
|
+ assertVisible(true);
|
|
|
+ assertFooterVisible(false);
|
|
|
+ Assert.equal(gURLBar.popup._matchCount, 0, "popup should have no results");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ Assert.ok(!gURLBar.popup.popupOpen, "popup should be closed");
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function privateWindow() {
|
|
|
+ // Since suggestions are disabled in private windows, the notification should
|
|
|
+ // not appear even when suggestions are otherwise enabled.
|
|
|
+ setupVisibleHint();
|
|
|
+ let win = await BrowserTestUtils.openNewBrowserWindow({ private: true });
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_urlbarTrimURLs.js b/browser/base/content/test/urlbar/browser_urlbarTrimURLs.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_urlbarTrimURLs.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_urlbarTrimURLs.js
|
|
|
+@@ -1,15 +1,15 @@
|
|
|
+ add_task(async function() {
|
|
|
+ const PREF_TRIMURLS = "browser.urlbar.trimURLs";
|
|
|
+
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
|
|
|
+
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ Services.prefs.clearUserPref(PREF_TRIMURLS);
|
|
|
+ URLBarSetURI();
|
|
|
+ });
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref(PREF_TRIMURLS, true);
|
|
|
+
|
|
|
+ testVal("http://mozilla.org/", "mozilla.org");
|
|
|
+ testVal("https://mozilla.org/", "https://mozilla.org");
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_urlbar_blanking.js b/browser/base/content/test/urlbar/browser_urlbar_blanking.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_urlbar_blanking.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_urlbar_blanking.js
|
|
|
+@@ -3,17 +3,17 @@
|
|
|
+ add_task(async function() {
|
|
|
+ for (let page of gInitialPages) {
|
|
|
+ if (page == "about:newtab") {
|
|
|
+ // New tab preloading makes this a pain to test, so skip
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, page);
|
|
|
+ ok(!gURLBar.value, "The URL bar should be empty if we load a plain " + page + " page.");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ const URI = "http://www.example.com/browser/browser/base/content/test/urlbar/file_blank_but_not_blank.html";
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, URI);
|
|
|
+ is(gURLBar.value, URI, "The URL bar should match the URI");
|
|
|
+ let browserLoaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
|
|
|
+@@ -25,11 +25,11 @@ add_task(async function() {
|
|
|
+ // When reloading, the javascript: uri we're using will throw an exception.
|
|
|
+ // That's deliberate, so we need to tell mochitest to ignore it:
|
|
|
+ SimpleTest.expectUncaughtException(true);
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, null, async function() {
|
|
|
+ // This is sync, so by the time we return we should have changed the URL bar.
|
|
|
+ content.location.reload();
|
|
|
+ });
|
|
|
+ ok(!!gURLBar.value, "URL bar should not be blank.");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ SimpleTest.expectUncaughtException(false);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_urlbar_stop_pending.js b/browser/base/content/test/urlbar/browser_urlbar_stop_pending.js
|
|
|
+--- a/browser/base/content/test/urlbar/browser_urlbar_stop_pending.js
|
|
|
++++ b/browser/base/content/test/urlbar/browser_urlbar_stop_pending.js
|
|
|
+@@ -33,17 +33,17 @@ add_task(async function() {
|
|
|
+ let pageLoadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
|
|
|
+ gURLBar.value = expectedURLBarChange;
|
|
|
+ gURLBar.handleCommand();
|
|
|
+ is(gURLBar.value, expectedURLBarChange, "Should not have changed URL bar value synchronously.");
|
|
|
+ await pageLoadPromise;
|
|
|
+ ok(sawChange, "The URL bar change handler should have been called by the time the page was loaded");
|
|
|
+ obs.disconnect();
|
|
|
+ obs = null;
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Check that if we:
|
|
|
+ * 1) middle-click a link to a separate page whose server doesn't respond
|
|
|
+ * 2) we switch to that tab and stop the request
|
|
|
+ *
|
|
|
+ * The URL bar continues to contain the URL of the page we wanted to visit.
|
|
|
+@@ -75,18 +75,18 @@ add_task(async function() {
|
|
|
+ let newTab = (await newTabPromise).target;
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, newTab);
|
|
|
+ is(gURLBar.value, SLOW_HOST, "Should have slow page in URL bar");
|
|
|
+ let browserStoppedPromise = BrowserTestUtils.browserStopped(newTab.linkedBrowser, null, true);
|
|
|
+ BrowserStop();
|
|
|
+ await browserStoppedPromise;
|
|
|
+
|
|
|
+ is(gURLBar.value, SLOW_HOST, "Should still have slow page in URL bar after stop");
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ /**
|
|
|
+ * Check that if we:
|
|
|
+ * 1) middle-click a link to a separate page whose server doesn't respond
|
|
|
+ * 2) we alter the URL on that page to some other server that doesn't respond
|
|
|
+ * 3) we stop the request
|
|
|
+ *
|
|
|
+ * The URL bar continues to contain the second URL.
|
|
|
+@@ -128,12 +128,12 @@ add_task(async function() {
|
|
|
+ await browserStoppedPromise;
|
|
|
+
|
|
|
+ is(gURLBar.value, SLOW_HOST2, "Should have second slow page in URL bar");
|
|
|
+ browserStoppedPromise = BrowserTestUtils.browserStopped(newTab.linkedBrowser, null, true);
|
|
|
+ BrowserStop();
|
|
|
+ await browserStoppedPromise;
|
|
|
+
|
|
|
+ is(gURLBar.value, SLOW_HOST2, "Should still have second slow page in URL bar after stop");
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/base/content/test/urlbar/browser_urlbar_whereToOpen.js.1442465-4_2.later b/browser/base/content/test/urlbar/browser_urlbar_whereToOpen.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/base/content/test/urlbar/browser_urlbar_whereToOpen.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,72 @@
|
|
|
++--- browser_urlbar_whereToOpen.js
|
|
|
+++++ browser_urlbar_whereToOpen.js
|
|
|
++@@ -35,17 +35,17 @@ add_task(async function openInTab() {
|
|
|
++ info(test.desc);
|
|
|
++
|
|
|
++ Preferences.set("browser.urlbar.openintab", test.pref);
|
|
|
++ let where = gURLBar._whereToOpen(test.event);
|
|
|
++ is(where, "tab", "URL would be loaded in a new tab");
|
|
|
++ }
|
|
|
++
|
|
|
++ // Clean up.
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function keepEmptyTab() {
|
|
|
++ // Open an empty tab.
|
|
|
++ let tab = gBrowser.selectedTab = await BrowserTestUtils.openNewForegroundTab(gBrowser, EMPTY_TAB);
|
|
|
++
|
|
|
++ for (let test of [{pref: false, event: META_CLICK,
|
|
|
++ desc: "Meta+click, empty tab, default prefs"},
|
|
|
++@@ -54,17 +54,17 @@ add_task(async function keepEmptyTab() {
|
|
|
++ info(test.desc);
|
|
|
++
|
|
|
++ Preferences.set("browser.urlbar.openintab", test.pref);
|
|
|
++ let where = gURLBar._whereToOpen(test.event);
|
|
|
++ is(where, "tab", "URL would be loaded in a new tab");
|
|
|
++ }
|
|
|
++
|
|
|
++ // Clean up.
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function reuseEmptyTab() {
|
|
|
++ // Open an empty tab.
|
|
|
++ let tab = gBrowser.selectedTab = await BrowserTestUtils.openNewForegroundTab(gBrowser, EMPTY_TAB);
|
|
|
++
|
|
|
++ for (let test of [{pref: false, event: ALT_ENTER,
|
|
|
++ desc: "Alt+Enter, empty tab, default prefs"},
|
|
|
++@@ -74,17 +74,17 @@ add_task(async function reuseEmptyTab()
|
|
|
++ desc: "Normal click, empty tab, openInTab"}]) {
|
|
|
++ info(test.desc);
|
|
|
++ Preferences.set("browser.urlbar.openintab", test.pref);
|
|
|
++ let where = gURLBar._whereToOpen(test.event);
|
|
|
++ is(where, "current", "New URL would reuse the current empty tab");
|
|
|
++ }
|
|
|
++
|
|
|
++ // Clean up.
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function openInCurrentTab() {
|
|
|
++ for (let test of [{pref: false, url: NON_EMPTY_TAB, event: ENTER,
|
|
|
++ desc: "Enter, non-empty tab, default prefs"},
|
|
|
++ {pref: false, url: NON_EMPTY_TAB, event: CLICK,
|
|
|
++ desc: "Normal click, non-empty tab, default prefs"},
|
|
|
++ {pref: false, url: EMPTY_TAB, event: ENTER,
|
|
|
++@@ -102,11 +102,11 @@ add_task(async function openInCurrentTab
|
|
|
++ // Open a new tab.
|
|
|
++ let tab = gBrowser.selectedTab = await BrowserTestUtils.openNewForegroundTab(gBrowser, test.url);
|
|
|
++
|
|
|
++ Preferences.set("browser.urlbar.openintab", test.pref);
|
|
|
++ let where = gURLBar._whereToOpen(test.event);
|
|
|
++ is(where, "current", "URL would open in the current tab");
|
|
|
++
|
|
|
++ // Clean up.
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ }
|
|
|
++ });
|
|
|
+diff --git a/browser/base/content/test/webextensions/browser_extension_sideloading.js b/browser/base/content/test/webextensions/browser_extension_sideloading.js
|
|
|
+--- a/browser/base/content/test/webextensions/browser_extension_sideloading.js
|
|
|
++++ b/browser/base/content/test/webextensions/browser_extension_sideloading.js
|
|
|
+@@ -147,17 +147,17 @@ add_task(async function() {
|
|
|
+
|
|
|
+ let [addon1, addon2, addon3, addon4] = await AddonManager.getAddonsByIDs([ID1, ID2, ID3, ID4]);
|
|
|
+ ok(addon1.seen, "Addon should be marked as seen");
|
|
|
+ is(addon1.userDisabled, true, "Addon 1 should still be disabled");
|
|
|
+ is(addon2.userDisabled, true, "Addon 2 should still be disabled");
|
|
|
+ is(addon3.userDisabled, true, "Addon 3 should still be disabled");
|
|
|
+ is(addon4.userDisabled, true, "Addon 4 should still be disabled");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ // Should still have 3 entries in the hamburger menu
|
|
|
+ await PanelUI.show();
|
|
|
+
|
|
|
+ addons = PanelUI.addonNotificationContainer;
|
|
|
+ is(addons.children.length, 3, "Have 3 menu entries for sideloaded extensions");
|
|
|
+
|
|
|
+ // Click the second sideloaded extension and wait for the notification
|
|
|
+@@ -251,10 +251,10 @@ add_task(async function() {
|
|
|
+ isnot(menuButton.getAttribute("badge-status"), "addon-alert", "Should no longer have addon alert badge");
|
|
|
+
|
|
|
+ await new Promise(resolve => setTimeout(resolve, 100));
|
|
|
+
|
|
|
+ for (let addon of [addon1, addon2, addon3, addon4]) {
|
|
|
+ addon.uninstall();
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/webextensions/browser_extension_update_background.js b/browser/base/content/test/webextensions/browser_extension_update_background.js
|
|
|
+--- a/browser/base/content/test/webextensions/browser_extension_update_background.js
|
|
|
++++ b/browser/base/content/test/webextensions/browser_extension_update_background.js
|
|
|
+@@ -110,17 +110,17 @@ async function backgroundUpdateTest(url,
|
|
|
+ is(list.childElementCount, 1, "Permissions list contains 1 entry");
|
|
|
+
|
|
|
+ // Cancel the update.
|
|
|
+ panel.secondaryButton.click();
|
|
|
+
|
|
|
+ addon = await AddonManager.getAddonByID(id);
|
|
|
+ is(addon.version, "1.0", "Should still be running the old version");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ // Alert badge and hamburger menu items should be gone
|
|
|
+ is(getBadgeStatus(), "", "Addon alert badge should be gone");
|
|
|
+
|
|
|
+ await PanelUI.show();
|
|
|
+ addons = PanelUI.addonNotificationContainer;
|
|
|
+ is(addons.children.length, 0, "Update menu entries should be gone");
|
|
|
+ await PanelUI.hide();
|
|
|
+@@ -155,17 +155,17 @@ async function backgroundUpdateTest(url,
|
|
|
+ // Wait for the permission prompt and accept it this time
|
|
|
+ updatePromise = waitForUpdate(addon);
|
|
|
+ panel = await popupPromise;
|
|
|
+ panel.button.click();
|
|
|
+
|
|
|
+ addon = await updatePromise;
|
|
|
+ is(addon.version, "2.0", "Should have upgraded to the new version");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ is(getBadgeStatus(), "", "Addon alert badge should be gone");
|
|
|
+
|
|
|
+ // Should have recorded 1 canceled followed by 1 accepted update.
|
|
|
+ expectTelemetry(["updateRejected", "updateAccepted"]);
|
|
|
+
|
|
|
+ addon.uninstall();
|
|
|
+ await SpecialPowers.popPrefEnv();
|
|
|
+diff --git a/browser/base/content/test/webextensions/browser_permissions_unsigned.js b/browser/base/content/test/webextensions/browser_permissions_unsigned.js
|
|
|
+--- a/browser/base/content/test/webextensions/browser_permissions_unsigned.js
|
|
|
++++ b/browser/base/content/test/webextensions/browser_permissions_unsigned.js
|
|
|
+@@ -32,10 +32,10 @@ add_task(async function test_unsigned()
|
|
|
+ // cancel the install
|
|
|
+ let promise = promiseInstallEvent({id: ID}, "onInstallCancelled");
|
|
|
+ panel.secondaryButton.click();
|
|
|
+ await promise;
|
|
|
+
|
|
|
+ let addon = await AddonManager.getAddonByID(ID);
|
|
|
+ is(addon, null, "Extension is not installed");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/base/content/test/webextensions/browser_update_interactive_noprompt.js b/browser/base/content/test/webextensions/browser_update_interactive_noprompt.js
|
|
|
+--- a/browser/base/content/test/webextensions/browser_update_interactive_noprompt.js
|
|
|
++++ b/browser/base/content/test/webextensions/browser_update_interactive_noprompt.js
|
|
|
+@@ -42,17 +42,17 @@ async function testUpdateNoPrompt(filena
|
|
|
+ await updatePromise;
|
|
|
+
|
|
|
+ addon = await AddonManager.getAddonByID(id);
|
|
|
+ is(addon.version, updateVersion, "Should have upgraded");
|
|
|
+
|
|
|
+ ok(!sawPopup, "Should not have seen a permission notification");
|
|
|
+ PopupNotifications.panel.removeEventListener("popupshown", popupListener);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ addon.uninstall();
|
|
|
+ }
|
|
|
+
|
|
|
+ // Test that we don't see a prompt when updating from a legacy
|
|
|
+ // extension to a webextension.
|
|
|
+ add_task(() => testUpdateNoPrompt("browser_legacy.xpi",
|
|
|
+ "legacy_update@tests.mozilla.org", "1.1"));
|
|
|
+
|
|
|
+diff --git a/browser/base/content/test/webextensions/head.js b/browser/base/content/test/webextensions/head.js
|
|
|
+--- a/browser/base/content/test/webextensions/head.js
|
|
|
++++ b/browser/base/content/test/webextensions/head.js
|
|
|
+@@ -345,17 +345,17 @@ async function testInstallMethod(install
|
|
|
+ ok(!result, "Installation was cancelled");
|
|
|
+ is(addon, null, "Extension is not installed");
|
|
|
+ } else {
|
|
|
+ ok(result, "Installation completed");
|
|
|
+ isnot(addon, null, "Extension is installed");
|
|
|
+ addon.uninstall();
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ // A few different tests for each installation method:
|
|
|
+ // 1. Start installation of an extension that requests no permissions,
|
|
|
+ // verify the notification contents, then cancel the install
|
|
|
+ await runOnce(NO_PERMS_XPI, true);
|
|
|
+
|
|
|
+ // 2. Same as #1 but with an extension that requests some permissions.
|
|
|
+@@ -463,17 +463,17 @@ async function interactiveUpdateTest(aut
|
|
|
+ panel = await popupPromise;
|
|
|
+ panel.button.click();
|
|
|
+
|
|
|
+ addon = await updatePromise;
|
|
|
+ is(addon.version, "2.0", "Should have upgraded");
|
|
|
+
|
|
|
+ await checkPromise;
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ addon.uninstall();
|
|
|
+ await SpecialPowers.popPrefEnv();
|
|
|
+ }
|
|
|
+
|
|
|
+ // The tests in this directory install a bunch of extensions but they
|
|
|
+ // need to uninstall them before exiting, as a stray leftover extension
|
|
|
+ // after one test can foul up subsequent tests.
|
|
|
+ // So, add a task to run before any tests that grabs a list of all the
|
|
|
+diff --git a/browser/base/content/test/webrtc/browser_devices_get_user_media_anim.js b/browser/base/content/test/webrtc/browser_devices_get_user_media_anim.js
|
|
|
+--- a/browser/base/content/test/webrtc/browser_devices_get_user_media_anim.js
|
|
|
++++ b/browser/base/content/test/webrtc/browser_devices_get_user_media_anim.js
|
|
|
+@@ -44,17 +44,17 @@ var gTests = [
|
|
|
+ is(gBrowser.selectedTab.getAttribute("sharing"), "",
|
|
|
+ "the new tab doesn't have the 'sharing' attribute");
|
|
|
+ is(tab.getAttribute("sharing"), aSharing,
|
|
|
+ "the tab still has the 'sharing' attribute");
|
|
|
+ isnot(window.getComputedStyle(icon).display, "none",
|
|
|
+ "the animated sharing icon of the tab is now visible");
|
|
|
+
|
|
|
+ // Ensure the icon disappears when selecting the tab.
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ ok(tab.selected, "the tab with ongoing sharing is selected again");
|
|
|
+ is(window.getComputedStyle(icon).display, "none",
|
|
|
+ "the animated sharing icon is gone after selecting the tab again");
|
|
|
+
|
|
|
+ // And finally verify the attribute is removed when closing the stream.
|
|
|
+ await closeStream();
|
|
|
+
|
|
|
+ // TODO(Bug 1304997): Fix the race in closeStream() and remove this
|
|
|
+diff --git a/browser/base/content/test/webrtc/head.js b/browser/base/content/test/webrtc/head.js
|
|
|
+--- a/browser/base/content/test/webrtc/head.js
|
|
|
++++ b/browser/base/content/test/webrtc/head.js
|
|
|
+@@ -549,10 +549,10 @@ async function runTests(tests, options =
|
|
|
+
|
|
|
+ for (let testCase of tests) {
|
|
|
+ info(testCase.desc);
|
|
|
+ await testCase.run(browser);
|
|
|
+ await cleanup();
|
|
|
+ }
|
|
|
+
|
|
|
+ // Some tests destroy the original tab and leave a new one in its place.
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ }
|
|
|
+diff --git a/browser/components/contextualidentity/test/browser/browser_aboutURLs.js b/browser/components/contextualidentity/test/browser/browser_aboutURLs.js
|
|
|
+--- a/browser/components/contextualidentity/test/browser/browser_aboutURLs.js
|
|
|
++++ b/browser/components/contextualidentity/test/browser/browser_aboutURLs.js
|
|
|
+@@ -38,11 +38,11 @@ add_task(async function() {
|
|
|
+
|
|
|
+ for (let url of aboutURLs) {
|
|
|
+ info("Loading about:" + url);
|
|
|
+ let tab = BrowserTestUtils.addTab(gBrowser, "about:" + url, {userContextId: 1});
|
|
|
+ await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
|
|
|
+
|
|
|
+ ok(true, "Done loading about:" + url);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+diff --git a/browser/components/contextualidentity/test/browser/browser_blobUrl.js b/browser/components/contextualidentity/test/browser/browser_blobUrl.js
|
|
|
+--- a/browser/components/contextualidentity/test/browser/browser_blobUrl.js
|
|
|
++++ b/browser/components/contextualidentity/test/browser/browser_blobUrl.js
|
|
|
+@@ -64,12 +64,12 @@ add_task(async function test() {
|
|
|
+ } catch (e) {
|
|
|
+ resolve("SendThrew");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }).then(status => {
|
|
|
+ is(status, "SendSucceeded", "Using a blob URI within a single user context id should work");
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
+- await BrowserTestUtils.removeTab(tab3);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab3);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/contextualidentity/test/browser/browser_eme.js b/browser/components/contextualidentity/test/browser/browser_eme.js
|
|
|
+--- a/browser/components/contextualidentity/test/browser/browser_eme.js
|
|
|
++++ b/browser/components/contextualidentity/test/browser/browser_eme.js
|
|
|
+@@ -169,13 +169,13 @@ add_task(async function test() {
|
|
|
+
|
|
|
+ let map = session.keyStatuses;
|
|
|
+
|
|
|
+ // Check that there is no media key here.
|
|
|
+ is(map.size, 0, "No media key should be here for the personal container.");
|
|
|
+ });
|
|
|
+
|
|
|
+ // Close default container tab.
|
|
|
+- await BrowserTestUtils.removeTab(defaultContainer.tab);
|
|
|
++ BrowserTestUtils.removeTab(defaultContainer.tab);
|
|
|
+
|
|
|
+ // Close personal container tab.
|
|
|
+- await BrowserTestUtils.removeTab(personalContainer.tab);
|
|
|
++ BrowserTestUtils.removeTab(personalContainer.tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/contextualidentity/test/browser/browser_favicon.js b/browser/components/contextualidentity/test/browser/browser_favicon.js
|
|
|
+--- a/browser/components/contextualidentity/test/browser/browser_favicon.js
|
|
|
++++ b/browser/components/contextualidentity/test/browser/browser_favicon.js
|
|
|
+@@ -126,11 +126,11 @@ add_task(async function test() {
|
|
|
+ true, PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE, {
|
|
|
+ onComplete() {
|
|
|
+ resolve();
|
|
|
+ },
|
|
|
+ },
|
|
|
+ tabInfo.browser.contentPrincipal);
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tabInfo.tab);
|
|
|
++ BrowserTestUtils.removeTab(tabInfo.tab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+diff --git a/browser/components/contextualidentity/test/browser/browser_forgetAPI_EME_forgetThisSite.js b/browser/components/contextualidentity/test/browser/browser_forgetAPI_EME_forgetThisSite.js
|
|
|
+--- a/browser/components/contextualidentity/test/browser/browser_forgetAPI_EME_forgetThisSite.js
|
|
|
++++ b/browser/components/contextualidentity/test/browser/browser_forgetAPI_EME_forgetThisSite.js
|
|
|
+@@ -191,28 +191,28 @@ add_task(async function test_EME_forgetT
|
|
|
+ for (let userContextId of Object.keys(USER_CONTEXTS)) {
|
|
|
+ // Open our tab in the given user context.
|
|
|
+ tabs[userContextId] = await openTabInUserContext(TEST_URL + "empty_file.html", userContextId);
|
|
|
+
|
|
|
+ // Setup EME Key.
|
|
|
+ emeSessionIds[userContextId] = await setupEMEKey(tabs[userContextId].browser);
|
|
|
+
|
|
|
+ // Close this tab.
|
|
|
+- await BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
++ BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ // Clear all EME data for a given domain with originAttributes pattern.
|
|
|
+ let mps = Cc["@mozilla.org/gecko-media-plugin-service;1"].
|
|
|
+ getService(Ci.mozIGeckoMediaPluginChromeService);
|
|
|
+ mps.forgetThisSite(TEST_HOST, JSON.stringify({}));
|
|
|
+
|
|
|
+ // Open tabs again to check EME keys have been cleared.
|
|
|
+ for (let userContextId of Object.keys(USER_CONTEXTS)) {
|
|
|
+ // Open our tab in the given user context.
|
|
|
+ tabs[userContextId] = await openTabInUserContext(TEST_URL + "empty_file.html", userContextId);
|
|
|
+
|
|
|
+ // Check whether EME Key has been cleared.
|
|
|
+ await checkEMEKey(tabs[userContextId].browser, emeSessionIds[userContextId]);
|
|
|
+
|
|
|
+ // Close this tab.
|
|
|
+- await BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
++ BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+diff --git a/browser/components/contextualidentity/test/browser/browser_forgetAPI_cookie_getCookiesWithOriginAttributes.js b/browser/components/contextualidentity/test/browser/browser_forgetAPI_cookie_getCookiesWithOriginAttributes.js
|
|
|
+--- a/browser/components/contextualidentity/test/browser/browser_forgetAPI_cookie_getCookiesWithOriginAttributes.js
|
|
|
++++ b/browser/components/contextualidentity/test/browser/browser_forgetAPI_cookie_getCookiesWithOriginAttributes.js
|
|
|
+@@ -52,17 +52,17 @@ add_task(async function test_cookie_getC
|
|
|
+ // Load the page in 2 different contexts and set a cookie
|
|
|
+ // which should only be visible in that context.
|
|
|
+ let value = USER_CONTEXTS[userContextId];
|
|
|
+
|
|
|
+ // Open our tab in the given user context.
|
|
|
+ tabs[userContextId] = await openTabInUserContext(TEST_URL + "file_reflect_cookie_into_title.html?" + value, userContextId);
|
|
|
+
|
|
|
+ // Close this tab.
|
|
|
+- await BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
++ BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ // Check that cookies have been set properly.
|
|
|
+ for (let userContextId of Object.keys(USER_CONTEXTS)) {
|
|
|
+ let enumerator = getCookiesForOA(TEST_HOST, userContextId);
|
|
|
+ ok(enumerator.hasMoreElements(), "Cookies available");
|
|
|
+
|
|
|
+ let foundCookie = enumerator.getNext().QueryInterface(Ci.nsICookie2);
|
|
|
+diff --git a/browser/components/contextualidentity/test/browser/browser_forgetAPI_quota_clearStoragesForPrincipal.js b/browser/components/contextualidentity/test/browser/browser_forgetAPI_quota_clearStoragesForPrincipal.js
|
|
|
+--- a/browser/components/contextualidentity/test/browser/browser_forgetAPI_quota_clearStoragesForPrincipal.js
|
|
|
++++ b/browser/components/contextualidentity/test/browser/browser_forgetAPI_quota_clearStoragesForPrincipal.js
|
|
|
+@@ -112,17 +112,17 @@ add_task(async function test_quota_clear
|
|
|
+ for (let userContextId of Object.keys(USER_CONTEXTS)) {
|
|
|
+ // Open our tab in the given user context.
|
|
|
+ tabs[userContextId] = await openTabInUserContext(TEST_URL + "empty_file.html", userContextId);
|
|
|
+
|
|
|
+ // Setup an entry for the indexedDB.
|
|
|
+ await setupIndexedDB(tabs[userContextId].browser);
|
|
|
+
|
|
|
+ // Close this tab.
|
|
|
+- await BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
++ BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ // Using quota manager to clear all indexed DB for a given domain.
|
|
|
+ let caUtils = {};
|
|
|
+ Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js",
|
|
|
+ caUtils);
|
|
|
+ let httpURI = caUtils.makeURI("http://" + TEST_HOST);
|
|
|
+ let httpPrincipal = Services.scriptSecurityManager
|
|
|
+@@ -132,11 +132,11 @@ add_task(async function test_quota_clear
|
|
|
+ for (let userContextId of Object.keys(USER_CONTEXTS)) {
|
|
|
+ // Open our tab in the given user context.
|
|
|
+ tabs[userContextId] = await openTabInUserContext(TEST_URL + "empty_file.html", userContextId);
|
|
|
+
|
|
|
+ // Check whether indexed DB has been cleared.
|
|
|
+ await checkIndexedDB(tabs[userContextId].browser);
|
|
|
+
|
|
|
+ // Close this tab.
|
|
|
+- await BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
++ BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+diff --git a/browser/components/contextualidentity/test/browser/browser_forgetaboutsite.js b/browser/components/contextualidentity/test/browser/browser_forgetaboutsite.js
|
|
|
+--- a/browser/components/contextualidentity/test/browser/browser_forgetaboutsite.js
|
|
|
++++ b/browser/components/contextualidentity/test/browser/browser_forgetaboutsite.js
|
|
|
+@@ -126,17 +126,17 @@ async function test_cookie_cleared() {
|
|
|
+ // Load the page in 2 different contexts and set a cookie
|
|
|
+ // which should only be visible in that context.
|
|
|
+ let value = USER_CONTEXTS[userContextId];
|
|
|
+
|
|
|
+ // Open our tab in the given user context.
|
|
|
+ tabs[userContextId] = await openTabInUserContext(TEST_URL + "file_reflect_cookie_into_title.html?" + value, userContextId);
|
|
|
+
|
|
|
+ // Close this tab.
|
|
|
+- await BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
++ BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
+ }
|
|
|
+ // Check that cookies have been set properly.
|
|
|
+ for (let userContextId of Object.keys(USER_CONTEXTS)) {
|
|
|
+ let enumerator = getCookiesForOA(TEST_HOST, userContextId);
|
|
|
+ ok(enumerator.hasMoreElements(), "Cookies available");
|
|
|
+
|
|
|
+ let foundCookie = enumerator.getNext().QueryInterface(Ci.nsICookie2);
|
|
|
+ Assert.equal(foundCookie.name, COOKIE_NAME, "Check cookie name");
|
|
|
+@@ -194,17 +194,17 @@ async function test_cache_cleared() {
|
|
|
+ // Image Cache
|
|
|
+ async function test_image_cache_cleared() {
|
|
|
+ let tabs = [];
|
|
|
+
|
|
|
+ for (let userContextId of Object.keys(USER_CONTEXTS)) {
|
|
|
+ // Open our tab in the given user context to cache image.
|
|
|
+ tabs[userContextId] = await openTabInUserContext("http://localhost:" + gHttpServer.identity.primaryPort + "/loadImage.html",
|
|
|
+ userContextId);
|
|
|
+- await BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
++ BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ let expectedHits = USER_CONTEXTS.length;
|
|
|
+
|
|
|
+ // Check that image cache works with the userContextId.
|
|
|
+ is(gHits, expectedHits, "The image should be loaded" + expectedHits + "times.");
|
|
|
+
|
|
|
+ // Reset the cache count.
|
|
|
+@@ -213,17 +213,17 @@ async function test_image_cache_cleared(
|
|
|
+ // Forget the site.
|
|
|
+ await ForgetAboutSite.removeDataFromDomain("localhost:" + gHttpServer.identity.primaryPort + "/");
|
|
|
+
|
|
|
+ // Load again.
|
|
|
+ for (let userContextId of Object.keys(USER_CONTEXTS)) {
|
|
|
+ // Open our tab in the given user context to cache image.
|
|
|
+ tabs[userContextId] = await openTabInUserContext("http://localhost:" + gHttpServer.identity.primaryPort + "/loadImage.html",
|
|
|
+ userContextId);
|
|
|
+- await BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
++ BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ // Check that image cache was cleared and the server gets another two hits.
|
|
|
+ is(gHits, expectedHits, "The image should be loaded" + expectedHits + "times.");
|
|
|
+ }
|
|
|
+
|
|
|
+ // Offline Storage
|
|
|
+ async function test_storage_cleared() {
|
|
|
+@@ -261,17 +261,17 @@ async function test_storage_cleared() {
|
|
|
+ let res = storeRequest.result;
|
|
|
+ Assert.equal(res.userContext, arg.userContext, "Check the indexedDB value");
|
|
|
+ done();
|
|
|
+ };
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ // Close this tab.
|
|
|
+- await BrowserTestUtils.removeTab(tabInfo.tab);
|
|
|
++ BrowserTestUtils.removeTab(tabInfo.tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ // Forget the site.
|
|
|
+ await ForgetAboutSite.removeDataFromDomain(TEST_HOST);
|
|
|
+
|
|
|
+ // Open the tab again without setting the localStorage and check that the
|
|
|
+ // local storage has been cleared or not.
|
|
|
+ for (let userContextId of Object.keys(USER_CONTEXTS)) {
|
|
|
+@@ -298,17 +298,17 @@ async function test_storage_cleared() {
|
|
|
+ db.transaction(["obj"], "readonly");
|
|
|
+ Assert.ok(false, "The indexedDB should not exist");
|
|
|
+ } catch (e) {
|
|
|
+ Assert.equal(e.name, "NotFoundError", "The indexedDB does not exist as expected");
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ // Close the tab.
|
|
|
+- await BrowserTestUtils.removeTab(tabInfo.tab);
|
|
|
++ BrowserTestUtils.removeTab(tabInfo.tab);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function setup() {
|
|
|
+ // Make sure userContext is enabled.
|
|
|
+ await SpecialPowers.pushPrefEnv({"set": [
|
|
|
+ ["privacy.userContext.enabled", true]
|
|
|
+ ]});
|
|
|
+diff --git a/browser/components/contextualidentity/test/browser/browser_newtabButton.js b/browser/components/contextualidentity/test/browser/browser_newtabButton.js
|
|
|
+--- a/browser/components/contextualidentity/test/browser/browser_newtabButton.js
|
|
|
++++ b/browser/components/contextualidentity/test/browser/browser_newtabButton.js
|
|
|
+@@ -26,17 +26,17 @@ add_task(async function test_menu_with_t
|
|
|
+ ok(contextIdItem, `User context id ${i} exists`);
|
|
|
+
|
|
|
+ let waitForTabPromise = BrowserTestUtils.waitForNewTab(gBrowser);
|
|
|
+ EventUtils.synthesizeMouseAtCenter(contextIdItem, {});
|
|
|
+
|
|
|
+ let tab = await waitForTabPromise;
|
|
|
+
|
|
|
+ is(tab.getAttribute("usercontextid"), i, `New tab has UCI equal ${i}`);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_menu_without_timeout() {
|
|
|
+ await SpecialPowers.pushPrefEnv({"set": [
|
|
|
+ ["privacy.userContext.enabled", true],
|
|
|
+ ["privacy.userContext.longPressBehavior", 1]
|
|
|
+ ]});
|
|
|
+@@ -58,17 +58,17 @@ add_task(async function test_menu_withou
|
|
|
+ ok(contextIdItem, `User context id ${i} exists`);
|
|
|
+
|
|
|
+ let waitForTabPromise = BrowserTestUtils.waitForNewTab(gBrowser);
|
|
|
+ EventUtils.synthesizeMouseAtCenter(contextIdItem, {});
|
|
|
+
|
|
|
+ let tab = await waitForTabPromise;
|
|
|
+
|
|
|
+ is(tab.getAttribute("usercontextid"), i, `New tab has UCI equal ${i}`);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_no_menu() {
|
|
|
+ await SpecialPowers.pushPrefEnv({"set": [
|
|
|
+ ["privacy.userContext.enabled", true],
|
|
|
+ ["privacy.userContext.longPressBehavior", 0]
|
|
|
+ ]});
|
|
|
+diff --git a/browser/components/contextualidentity/test/browser/browser_relatedTab.js b/browser/components/contextualidentity/test/browser/browser_relatedTab.js
|
|
|
+--- a/browser/components/contextualidentity/test/browser/browser_relatedTab.js
|
|
|
++++ b/browser/components/contextualidentity/test/browser/browser_relatedTab.js
|
|
|
+@@ -5,27 +5,27 @@
|
|
|
+ */
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ let tab = BrowserTestUtils.addTab(gBrowser, "about:blank", {userContextId: 1});
|
|
|
+
|
|
|
+ gBrowser.selectedTab = tab;
|
|
|
+ let relatedTab = BrowserTestUtils.addTab(gBrowser, "about:blank", {relatedToCurrent: true});
|
|
|
+ is(relatedTab.getAttribute("usercontextid"), 1, "Related tab (relatedToCurrent) inherits current tab's usercontextid");
|
|
|
+- await BrowserTestUtils.removeTab(relatedTab);
|
|
|
++ BrowserTestUtils.removeTab(relatedTab);
|
|
|
+
|
|
|
+ gBrowser.selectedTab = tab;
|
|
|
+ relatedTab = BrowserTestUtils.addTab(gBrowser, "about:blank", {relatedToCurrent: true, userContextId: 2});
|
|
|
+ is(relatedTab.getAttribute("usercontextid"), 2, "Related tab (relatedToCurrent) with overridden usercontextid");
|
|
|
+- await BrowserTestUtils.removeTab(relatedTab);
|
|
|
++ BrowserTestUtils.removeTab(relatedTab);
|
|
|
+
|
|
|
+ gBrowser.selectedTab = tab;
|
|
|
+ relatedTab = BrowserTestUtils.addTab(gBrowser, "about:blank", {referrerURI: gBrowser.currentURI});
|
|
|
+ is(relatedTab.getAttribute("usercontextid"), 1, "Related tab (referrer) inherits current tab's usercontextid");
|
|
|
+- await BrowserTestUtils.removeTab(relatedTab);
|
|
|
++ BrowserTestUtils.removeTab(relatedTab);
|
|
|
+
|
|
|
+ gBrowser.selectedTab = tab;
|
|
|
+ relatedTab = BrowserTestUtils.addTab(gBrowser, "about:blank", {referrerURI: gBrowser.currentURI, userContextId: 2});
|
|
|
+ is(relatedTab.getAttribute("usercontextid"), 2, "Related tab (referrer) with overridden usercontextid");
|
|
|
+- await BrowserTestUtils.removeTab(relatedTab);
|
|
|
++ BrowserTestUtils.removeTab(relatedTab);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/contextualidentity/test/browser/browser_restore_getCookiesWithOriginAttributes.js b/browser/components/contextualidentity/test/browser/browser_restore_getCookiesWithOriginAttributes.js
|
|
|
+--- a/browser/components/contextualidentity/test/browser/browser_restore_getCookiesWithOriginAttributes.js
|
|
|
++++ b/browser/components/contextualidentity/test/browser/browser_restore_getCookiesWithOriginAttributes.js
|
|
|
+@@ -81,17 +81,17 @@ add_task(async function test_cookie_getC
|
|
|
+ // Load the page in different contexts and set a cookie
|
|
|
+ // which should only be visible in that context.
|
|
|
+ let value = USER_CONTEXTS[userContextId];
|
|
|
+
|
|
|
+ // Open our tab in the given user context.
|
|
|
+ tabs[userContextId] = await openTabInUserContext(TEST_URL + "file_reflect_cookie_into_title.html?" + value, userContextId);
|
|
|
+
|
|
|
+ // Close this tab.
|
|
|
+- await BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
++ BrowserTestUtils.removeTab(tabs[userContextId].tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ // Check that cookies have been set properly.
|
|
|
+ for (let userContextId of Object.keys(USER_CONTEXTS)) {
|
|
|
+ let enumerator = getCookiesForOA(TEST_HOST, userContextId);
|
|
|
+ ok(enumerator.hasMoreElements(), "Cookies available");
|
|
|
+
|
|
|
+ let foundCookie = enumerator.getNext().QueryInterface(Ci.nsICookie2);
|
|
|
+diff --git a/browser/components/contextualidentity/test/browser/browser_usercontextid_tabdrop.js b/browser/components/contextualidentity/test/browser/browser_usercontextid_tabdrop.js
|
|
|
+--- a/browser/components/contextualidentity/test/browser/browser_usercontextid_tabdrop.js
|
|
|
++++ b/browser/components/contextualidentity/test/browser/browser_usercontextid_tabdrop.js
|
|
|
+@@ -40,18 +40,18 @@ add_task(async function() {
|
|
|
+
|
|
|
+ // referrer is empty when urls are dragged to new or existing tabs.
|
|
|
+ // If this changes in the future, it would be okay to send the referrer
|
|
|
+ // in this case because we are creating a new tab with the default
|
|
|
+ // usercontextid as the original tab.
|
|
|
+ Assert.equal(content.document.referrer, "", "referrer should be empty");
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * When dragging an URL to a new tab, the new tab should have the same
|
|
|
+ * userContextId as the original tab.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ let tab = BrowserTestUtils.addTab(gBrowser, "http://example.com/", {userContextId: 1});
|
|
|
+@@ -87,18 +87,18 @@ add_task(async function() {
|
|
|
+
|
|
|
+ // referrer is empty when urls are dragged to new or existing tabs.
|
|
|
+ // If this changes in the future, it would be okay to send the referrer
|
|
|
+ // in this case because we are creating a new tab with the same
|
|
|
+ // usercontextid as the original tab.
|
|
|
+ Assert.equal(content.document.referrer, "", "referrer should be empty");
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * When dragging a URL from one tab or link on a tab to an existing tab, the
|
|
|
+ * existing tab should not change its userContextId.
|
|
|
+ * Ex: if you drag a link from tab 1 with userContext 1 to tab 2 with
|
|
|
+ * userContext 2, the link will open in tab 2 with userContext 2.
|
|
|
+ */
|
|
|
+@@ -124,11 +124,11 @@ add_task(async function() {
|
|
|
+
|
|
|
+ // referrer is empty when urls are dragged to new or existing tabs.
|
|
|
+ // If this changes in the future, we should ensure that we are not sending
|
|
|
+ // a referrer for this case! When opening links across user contexts, we
|
|
|
+ // don't want the referrer to follow the user from one context to another.
|
|
|
+ Assert.equal(content.document.referrer, "", "referrer should be empty");
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/contextualidentity/test/browser/browser_windowOpen.js b/browser/components/contextualidentity/test/browser/browser_windowOpen.js
|
|
|
+--- a/browser/components/contextualidentity/test/browser/browser_windowOpen.js
|
|
|
++++ b/browser/components/contextualidentity/test/browser/browser_windowOpen.js
|
|
|
+@@ -30,10 +30,10 @@ add_task(async function test() {
|
|
|
+ let newWin = await BrowserTestUtils.waitForNewWindow();
|
|
|
+ let newTab = newWin.gBrowser.selectedTab;
|
|
|
+
|
|
|
+ await BrowserTestUtils.browserLoaded(newTab.linkedBrowser);
|
|
|
+ is(newTab.getAttribute("usercontextid"), 1, "New tab has UCI equal 1");
|
|
|
+
|
|
|
+ info("Closing the new window and tab...");
|
|
|
+ await BrowserTestUtils.closeWindow(newWin);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/customizableui/test/browser_947914_button_history.js.1442465-4_2.later b/browser/components/customizableui/test/browser_947914_button_history.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/customizableui/test/browser_947914_button_history.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,34 @@
|
|
|
++--- browser_947914_button_history.js
|
|
|
+++++ browser_947914_button_history.js
|
|
|
++@@ -4,17 +4,17 @@
|
|
|
++
|
|
|
++ "use strict";
|
|
|
++
|
|
|
++ const TEST_PATH = getRootDirectory(gTestPath).replace("chrome://mochitests/content", "http://example.com");
|
|
|
++
|
|
|
++ add_task(async function() {
|
|
|
++ info("Check history button existence and functionality");
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_PATH + "dummy_history_item.html");
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++
|
|
|
++ tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_PATH); // will 404, but we don't care.
|
|
|
++
|
|
|
++ CustomizableUI.addWidgetToArea("history-panelmenu", CustomizableUI.AREA_FIXED_OVERFLOW_PANEL);
|
|
|
++ registerCleanupFunction(() => CustomizableUI.reset());
|
|
|
++
|
|
|
++ await waitForOverflowButtonShown();
|
|
|
++
|
|
|
++@@ -36,11 +36,11 @@ add_task(async function() {
|
|
|
++ let historyItems = document.getElementById("appMenu_historyMenu");
|
|
|
++ let historyItemForURL = historyItems.querySelector("toolbarbutton.bookmark-item[label='Happy History Hero']");
|
|
|
++ ok(historyItemForURL, "Should have a history item for the history we just made.");
|
|
|
++ EventUtils.synthesizeMouseAtCenter(historyItemForURL, {});
|
|
|
++ await browserLoaded;
|
|
|
++ is(gBrowser.currentURI.spec, TEST_PATH + "dummy_history_item.html", "Should have expected page load");
|
|
|
++
|
|
|
++ await panelHiddenPromise;
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ info("Menu panel was closed");
|
|
|
++ });
|
|
|
+diff --git a/browser/components/customizableui/test/browser_967000_button_charEncoding.js b/browser/components/customizableui/test/browser_967000_button_charEncoding.js
|
|
|
+--- a/browser/components/customizableui/test/browser_967000_button_charEncoding.js
|
|
|
++++ b/browser/components/customizableui/test/browser_967000_button_charEncoding.js
|
|
|
+@@ -48,16 +48,16 @@ add_task(async function() {
|
|
|
+ is(characterEncodingView.querySelectorAll("#PanelUI-characterEncodingView-autodetect toolbarbutton[checked='true']").length,
|
|
|
+ 1,
|
|
|
+ "There should be 1 checked detector.");
|
|
|
+
|
|
|
+ panelHidePromise = promisePanelHidden(window);
|
|
|
+ PanelUI.hide();
|
|
|
+ await panelHidePromise;
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function asyncCleanup() {
|
|
|
+ // reset the panel to the default state
|
|
|
+ await resetCustomization();
|
|
|
+ ok(CustomizableUI.inDefaultState, "The UI is in default state again.");
|
|
|
+ });
|
|
|
+diff --git a/browser/components/customizableui/test/browser_987640_charEncoding.js b/browser/components/customizableui/test/browser_987640_charEncoding.js
|
|
|
+--- a/browser/components/customizableui/test/browser_987640_charEncoding.js
|
|
|
++++ b/browser/components/customizableui/test/browser_987640_charEncoding.js
|
|
|
+@@ -46,16 +46,16 @@ add_task(async function() {
|
|
|
+ charEncodingButton.click();
|
|
|
+ tabLoadPromise = promiseTabLoadEvent(gBrowser.selectedTab, TEST_PAGE);
|
|
|
+ initialEncoding.click();
|
|
|
+ await tabLoadPromise;
|
|
|
+ await PanelUI.show();
|
|
|
+ charEncodingButton.click();
|
|
|
+ checkedButtons = characterEncodingView.querySelectorAll("toolbarbutton[checked='true']");
|
|
|
+ is(checkedButtons[0].getAttribute("label"), "Unicode", "The encoding was reset to Unicode");
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function asyncCleanup() {
|
|
|
+ // reset the panel to the default state
|
|
|
+ await resetCustomization();
|
|
|
+ ok(CustomizableUI.inDefaultState, "The UI is in default state again.");
|
|
|
+ });
|
|
|
+diff --git a/browser/components/customizableui/test/browser_backfwd_enabled_post_customize.js.1442465-4_2.later b/browser/components/customizableui/test/browser_backfwd_enabled_post_customize.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/customizableui/test/browser_backfwd_enabled_post_customize.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,15 @@
|
|
|
++--- browser_backfwd_enabled_post_customize.js
|
|
|
+++++ browser_backfwd_enabled_post_customize.js
|
|
|
++@@ -27,11 +27,11 @@ add_task(async function test_back_forwar
|
|
|
++
|
|
|
++ is(backButton.getAttribute("disabled"), "true", "Back button should be disabled in customize mode");
|
|
|
++ is(forwardButton.getAttribute("disabled"), "true", "Forward button should be disabled in customize mode");
|
|
|
++
|
|
|
++ await endCustomizing();
|
|
|
++ ok(!backButton.hasAttribute("disabled"), "Back button shouldn't be disabled after customize mode");
|
|
|
++ ok(!forwardButton.hasAttribute("disabled"), "Forward button shouldn't be disabled after customize mode");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
+diff --git a/browser/components/customizableui/test/browser_customization_context_menus.js.1442465-4_2.later b/browser/components/customizableui/test/browser_customization_context_menus.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/customizableui/test/browser_customization_context_menus.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_customization_context_menus.js
|
|
|
+++++ browser_customization_context_menus.js
|
|
|
++@@ -69,17 +69,17 @@ add_task(async function tabstrip_context
|
|
|
++ ["---"],
|
|
|
++ [".viewCustomizeToolbar", true]
|
|
|
++ );
|
|
|
++ checkContextMenu(contextMenu, expectedEntries);
|
|
|
++
|
|
|
++ let hiddenPromise = popupHidden(contextMenu);
|
|
|
++ contextMenu.hidePopup();
|
|
|
++ await hiddenPromise;
|
|
|
++- await BrowserTestUtils.removeTab(extraTab);
|
|
|
+++ BrowserTestUtils.removeTab(extraTab);
|
|
|
++ });
|
|
|
++
|
|
|
++ // Right-click on an empty bit of extra toolbar should
|
|
|
++ // show a context menu with moving options disabled,
|
|
|
++ // and a toggle option for the extra toolbar
|
|
|
++ add_task(async function empty_toolbar_context() {
|
|
|
++ let contextMenu = document.getElementById("toolbar-context-menu");
|
|
|
++ let shownPromise = popupShown(contextMenu);
|
|
|
+diff --git a/browser/components/customizableui/test/browser_exit_background_customize_mode.js b/browser/components/customizableui/test/browser_exit_background_customize_mode.js
|
|
|
+--- a/browser/components/customizableui/test/browser_exit_background_customize_mode.js
|
|
|
++++ b/browser/components/customizableui/test/browser_exit_background_customize_mode.js
|
|
|
+@@ -27,10 +27,10 @@ add_task(async function test_exit_backgr
|
|
|
+ Assert.equal(gBrowser.tabContainer.querySelector("tab[customizemode=true]"),
|
|
|
+ null,
|
|
|
+ "Should not have a tab marked as being the customize tab now.");
|
|
|
+
|
|
|
+ await startCustomizing();
|
|
|
+ is(gBrowser.tabs.length, 3, "Should have 3 tabs now");
|
|
|
+
|
|
|
+ await endCustomizing();
|
|
|
+- await BrowserTestUtils.removeTab(custTab);
|
|
|
++ BrowserTestUtils.removeTab(custTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_addons.js.1442465-4_2.later b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_addons.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_addons.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,14 @@
|
|
|
++--- browser_policy_block_about_addons.js
|
|
|
+++++ browser_policy_block_about_addons.js
|
|
|
++@@ -20,10 +20,10 @@ add_task(async function test_about_addon
|
|
|
++ // There is currently a testing-specific race condition that causes this test
|
|
|
++ // to fail, but it is not a problem if we test after the first page load.
|
|
|
++ // Until the race condition is fixed, just make sure to test this *after*
|
|
|
++ // testing the page load.
|
|
|
++ is(Services.policies.isAllowed("about:addons"), false,
|
|
|
++ "Policy Engine should report about:addons as not allowed");
|
|
|
++ });
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_config.js.1442465-4_2.later b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_config.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_config.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,14 @@
|
|
|
++--- browser_policy_block_about_config.js
|
|
|
+++++ browser_policy_block_about_config.js
|
|
|
++@@ -18,10 +18,10 @@ add_task(async function test_about_confi
|
|
|
++ // There is currently a testing-specific race condition that causes this test
|
|
|
++ // to fail, but it is not a problem if we test after the first page load.
|
|
|
++ // Until the race condition is fixed, just make sure to test this *after*
|
|
|
++ // testing the page load.
|
|
|
++ is(Services.policies.isAllowed("about:config"), false,
|
|
|
++ "Policy Engine should report about:config as not allowed");
|
|
|
++ });
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_profiles.js.1442465-4_2.later b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_profiles.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_profiles.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,14 @@
|
|
|
++--- browser_policy_block_about_profiles.js
|
|
|
+++++ browser_policy_block_about_profiles.js
|
|
|
++@@ -20,10 +20,10 @@ add_task(async function test_about_profi
|
|
|
++ // There is currently a testing-specific race condition that causes this test
|
|
|
++ // to fail, but it is not a problem if we test after the first page load.
|
|
|
++ // Until the race condition is fixed, just make sure to test this *after*
|
|
|
++ // testing the page load.
|
|
|
++ is(Services.policies.isAllowed("about:profiles"), false,
|
|
|
++ "Policy Engine should report about:profiles as not allowed");
|
|
|
++ });
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_support.js.1442465-4_2.later b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_support.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_support.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,14 @@
|
|
|
++--- browser_policy_block_about_support.js
|
|
|
+++++ browser_policy_block_about_support.js
|
|
|
++@@ -20,10 +20,10 @@ add_task(async function test_about_suppo
|
|
|
++ // There is currently a testing-specific race condition that causes this test
|
|
|
++ // to fail, but it is not a problem if we test after the first page load.
|
|
|
++ // Until the race condition is fixed, just make sure to test this *after*
|
|
|
++ // testing the page load.
|
|
|
++ is(Services.policies.isAllowed("about:support"), false,
|
|
|
++ "Policy Engine should report about:support as not allowed");
|
|
|
++ });
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_block_set_desktop_background.js.1442465-4_2.later b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_set_desktop_background.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_set_desktop_background.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,14 @@
|
|
|
++--- browser_policy_block_set_desktop_background.js
|
|
|
+++++ browser_policy_block_set_desktop_background.js
|
|
|
++@@ -29,10 +29,10 @@ add_task(async function test_check_set_d
|
|
|
++
|
|
|
++ let buttonElement = document.getElementById("context-setDesktopBackground");
|
|
|
++ is(buttonElement.hidden, true,
|
|
|
++ "The \"Set Desktop Background\" context menu element should be hidden");
|
|
|
++
|
|
|
++ let promiseContextMenuHidden = BrowserTestUtils.waitForEvent(contextMenu, "popuphidden");
|
|
|
++ contextMenu.hidePopup();
|
|
|
++ await promiseContextMenuHidden;
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_set_homepage.js.1442465-4_2.later b/browser/components/enterprisepolicies/tests/browser/browser_policy_set_homepage.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_set_homepage.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,14 @@
|
|
|
++--- browser_policy_set_homepage.js
|
|
|
+++++ browser_policy_set_homepage.js
|
|
|
++@@ -161,10 +161,10 @@ add_task(async function homepage_test_lo
|
|
|
++ "Homepage input should be disabled");
|
|
|
++ is(content.document.getElementById("useCurrent").disabled, true,
|
|
|
++ "\"Use Current Page\" button should be disabled");
|
|
|
++ is(content.document.getElementById("useBookmark").disabled, true,
|
|
|
++ "\"Use Bookmark...\" button should be disabled");
|
|
|
++ is(content.document.getElementById("restoreDefaultHomePage").disabled, true,
|
|
|
++ "\"Restore to Default\" button should be disabled");
|
|
|
++ });
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/enterprisepolicies/tests/browser/disable_app_update/browser_policy_disable_app_update.js.1442465-4_2.later b/browser/components/enterprisepolicies/tests/browser/disable_app_update/browser_policy_disable_app_update.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/enterprisepolicies/tests/browser/disable_app_update/browser_policy_disable_app_update.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,14 @@
|
|
|
++--- browser_policy_disable_app_update.js
|
|
|
+++++ browser_policy_disable_app_update.js
|
|
|
++@@ -19,10 +19,10 @@ add_task(async function test_update_pref
|
|
|
++ await ContentTask.spawn(tab.linkedBrowser, null, async function() {
|
|
|
++ let updateRadioGroup = content.document.getElementById("updateRadioGroup");
|
|
|
++ is(updateRadioGroup.disabled, true,
|
|
|
++ "Update choices should be diabled when app update is locked by policy");
|
|
|
++ is(updateRadioGroup.value, "manual",
|
|
|
++ "Update choice should be set to \"manual\" when app update is disabled by policy");
|
|
|
++ });
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/enterprisepolicies/tests/browser/disable_developer_tools/browser_policy_disable_developer_tools.js.1442465-4_2.later b/browser/components/enterprisepolicies/tests/browser/disable_developer_tools/browser_policy_disable_developer_tools.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/enterprisepolicies/tests/browser/disable_developer_tools/browser_policy_disable_developer_tools.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,25 @@
|
|
|
++--- browser_policy_disable_developer_tools.js
|
|
|
+++++ browser_policy_disable_developer_tools.js
|
|
|
++@@ -25,20 +25,20 @@ add_task(async function test_updates_pos
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, testURL, false);
|
|
|
++
|
|
|
++ info("Check that devtools menu items are hidden");
|
|
|
++ let toolsMenu = window.document.getElementById("webDeveloperMenu");
|
|
|
++ ok(toolsMenu.hidden, "The Web Developer item of the tools menu is hidden");
|
|
|
++ let hamburgerMenu = window.document.getElementById("appMenu-developer-button");
|
|
|
++ ok(hamburgerMenu.hidden, "The Web Developer item of the hamburger menu is hidden");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ const expectErrorPage = async function(url) {
|
|
|
++ info(`Wait for ${url} to open the net error page`);
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, url, false);
|
|
|
++ await ContentTask.spawn(tab.linkedBrowser, null, async function() {
|
|
|
++ ok(content.document.documentURI.startsWith("about:neterror"),
|
|
|
++ "DevTools about: page should display the net error page");
|
|
|
++ });
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ };
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_autocompletepopup.js b/browser/components/extensions/test/browser/browser_ext_autocompletepopup.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_autocompletepopup.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_autocompletepopup.js
|
|
|
+@@ -75,10 +75,10 @@ add_task(async function testAutocomplete
|
|
|
+ clickBrowserAction(extension);
|
|
|
+ bowser = await awaitExtensionPanel(extension);
|
|
|
+ ok(!!bowser, "panel opened with browser");
|
|
|
+ await testDatalist(bowser, document);
|
|
|
+ closeBrowserAction(extension);
|
|
|
+ await new Promise(resolve => setTimeout(resolve, 0));
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js b/browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js
|
|
|
+@@ -77,17 +77,17 @@ add_task(async function testBrowserActio
|
|
|
+ is(browserAction.pendingPopup, null, "Pending popup was cleared");
|
|
|
+ is(browserAction.pendingPopupTimeout, null, "Pending popup timeout was cleared");
|
|
|
+
|
|
|
+ await promisePopupShown(getBrowserActionPopup(extension));
|
|
|
+ await closeBrowserAction(extension);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function testBrowserActionDisabled() {
|
|
|
+ // Make sure the mouse isn't hovering over the browserAction widget.
|
|
|
+ EventUtils.synthesizeMouseAtCenter(gURLBar, {type: "mouseover"}, window);
|
|
|
+
|
|
|
+ let extension = ExtensionTestUtils.loadExtension({
|
|
|
+ manifest: {
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_contentscript_animate.js b/browser/components/extensions/test/browser/browser_ext_contentscript_animate.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_contentscript_animate.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_contentscript_animate.js
|
|
|
+@@ -37,17 +37,17 @@ add_task(async function test_animate() {
|
|
|
+ },
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitFinish("contentScriptAnimate");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_KeyframeEffect() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://mochi.test:8888/");
|
|
|
+
|
|
|
+ let extension = ExtensionTestUtils.loadExtension({
|
|
|
+ manifest: {
|
|
|
+ "content_scripts": [
|
|
|
+@@ -86,10 +86,10 @@ add_task(async function test_KeyframeEff
|
|
|
+ },
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitFinish("contentScriptKeyframeEffect");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_contentscript_connect.js b/browser/components/extensions/test/browser/browser_ext_contentscript_connect.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_contentscript_connect.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_contentscript_connect.js
|
|
|
+@@ -58,10 +58,10 @@ add_task(async function() {
|
|
|
+ },
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitFinish("contentscript_connect.pass");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_contextMenus.js b/browser/components/extensions/test/browser/browser_ext_contextMenus.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_contextMenus.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_contextMenus.js
|
|
|
+@@ -40,17 +40,17 @@ add_task(async function() {
|
|
|
+
|
|
|
+ contentAreaContextMenu = await openContextMenu("body");
|
|
|
+ item = contentAreaContextMenu.getElementsByAttribute("label", "Click me!");
|
|
|
+ is(item.length, 1, "contextMenu item for page was found");
|
|
|
+ await closeContextMenu();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ let tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, PAGE);
|
|
|
+
|
|
|
+ gBrowser.selectedTab = tab1;
|
|
|
+
|
|
|
+ let extension = ExtensionTestUtils.loadExtension({
|
|
|
+@@ -369,17 +369,17 @@ add_task(async function() {
|
|
|
+ await extension.awaitMessage("removed");
|
|
|
+
|
|
|
+ let contentAreaContextMenu = await openContextMenu("#img1");
|
|
|
+ items = contentAreaContextMenu.getElementsByAttribute("ext-type", "top-level-menu");
|
|
|
+ is(items.length, 0, "top level item was not found (after removeAll()");
|
|
|
+ await closeContextMenu();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function testRemoveAllWithTwoExtensions() {
|
|
|
+ const tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, PAGE);
|
|
|
+ const manifest = {permissions: ["contextMenus"]};
|
|
|
+
|
|
|
+ const first = ExtensionTestUtils.loadExtension({manifest, background() {
|
|
|
+ browser.contextMenus.create({title: "alpha", contexts: ["all"]});
|
|
|
+@@ -443,10 +443,10 @@ add_task(async function testRemoveAllWit
|
|
|
+ await closeExtensionContextMenu(beta);
|
|
|
+
|
|
|
+ // Confirm only gamma is left.
|
|
|
+ await confirmMenuItems("gamma");
|
|
|
+ await closeContextMenu();
|
|
|
+
|
|
|
+ await first.unload();
|
|
|
+ await second.unload();
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_contextMenus_checkboxes.js b/browser/components/extensions/test/browser/browser_ext_contextMenus_checkboxes.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_contextMenus_checkboxes.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_contextMenus_checkboxes.js
|
|
|
+@@ -115,10 +115,10 @@ add_task(async function() {
|
|
|
+ extensionMenuRoot = await openExtensionContextMenu();
|
|
|
+ items = confirmCheckboxStates(extensionMenuRoot, [false, true, true]);
|
|
|
+ await closeExtensionContextMenu(items[2]);
|
|
|
+
|
|
|
+ result = await extension.awaitMessage("contextmenus-click");
|
|
|
+ confirmOnClickData(result, 3, true, false);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_contextMenus_commands.js b/browser/components/extensions/test/browser/browser_ext_contextMenus_commands.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_contextMenus_commands.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_contextMenus_commands.js
|
|
|
+@@ -71,11 +71,11 @@ add_task(async function() {
|
|
|
+ // open a page so page action works
|
|
|
+ const PAGE = "http://mochi.test:8888/browser/browser/components/extensions/test/browser/context.html?test=commands";
|
|
|
+ const tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, PAGE);
|
|
|
+
|
|
|
+ ok(await testContext("open_sidebar_action"), "_execute_sidebar_action worked");
|
|
|
+ ok(await testContext("open_browser_action"), "_execute_browser_action worked");
|
|
|
+ ok(await testContext("open_page_action"), "_execute_page_action worked");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_contextMenus_icons.js b/browser/components/extensions/test/browser/browser_ext_contextMenus_icons.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_contextMenus_icons.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_contextMenus_icons.js
|
|
|
+@@ -65,17 +65,17 @@ add_task(async function test_root_icon()
|
|
|
+
|
|
|
+ contextMenu = document.getElementById("contentAreaContextMenu");
|
|
|
+ topLevelMenuItem = contextMenu.getElementsByAttribute("label", "child");
|
|
|
+
|
|
|
+ confirmContextMenuIcon(topLevelMenuItem);
|
|
|
+ await closeContextMenu();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_child_icon() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, PAGE);
|
|
|
+
|
|
|
+ let blackIconData = "iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAIAAADZrBkAAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4QYGEhkO2P07+gAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAARSURBVCjPY2AYBaNgFAxPAAAD3gABo0ohTgAAAABJRU5ErkJggg==";
|
|
|
+ const IMAGE_ARRAYBUFFER_BLACK = imageBufferFromDataURI(blackIconData);
|
|
|
+
|
|
|
+@@ -167,10 +167,10 @@ add_task(async function test_child_icon(
|
|
|
+ confirmContextMenuIcon(contextMenuChild2, "blue_icon.png");
|
|
|
+
|
|
|
+ let contextMenuChild3 = contextMenu.getElementsByAttribute("label", "child3")[0];
|
|
|
+ confirmContextMenuIcon(contextMenuChild3, "green_icon.png");
|
|
|
+
|
|
|
+ await closeContextMenu();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_contextMenus_onclick.js b/browser/components/extensions/test/browser/browser_ext_contextMenus_onclick.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_contextMenus_onclick.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_contextMenus_onclick.js
|
|
|
+@@ -188,17 +188,17 @@ add_task(async function() {
|
|
|
+
|
|
|
+ // Remove context menu for the next iteration of the test. And just to get
|
|
|
+ // more coverage, let's use removeAll instead of remove.
|
|
|
+ extension.sendMessage(pageOne, "removeAll");
|
|
|
+ await extension.awaitMessage("next");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ await extension.unload();
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_onclick_modifiers() {
|
|
|
+ const manifest = {
|
|
|
+ permissions: ["contextMenus"],
|
|
|
+ };
|
|
|
+
|
|
|
+ function background() {
|
|
|
+@@ -237,11 +237,11 @@ add_task(async function test_onclick_mod
|
|
|
+
|
|
|
+ const meta = await click({metaKey: true});
|
|
|
+ is(meta.modifiers.join(), "Command", "Correct modifier: Command");
|
|
|
+ }
|
|
|
+
|
|
|
+ const altShift = await click({altKey: true, shiftKey: true});
|
|
|
+ is(altShift.modifiers.sort().join(), "Alt,Shift", "Correct modifiers: Shift+Alt");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_contextMenus_radioGroups.js b/browser/components/extensions/test/browser/browser_ext_contextMenus_radioGroups.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_contextMenus_radioGroups.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_contextMenus_radioGroups.js
|
|
|
+@@ -91,10 +91,10 @@ add_task(async function() {
|
|
|
+ extensionMenuRoot = await openExtensionContextMenu();
|
|
|
+ items = confirmRadioGroupStates(extensionMenuRoot, [true, false, true]);
|
|
|
+ await closeExtensionContextMenu(items[0]);
|
|
|
+
|
|
|
+ result = await extension.awaitMessage("contextmenus-click");
|
|
|
+ confirmOnClickData(result, 1, true, true);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_contextMenus_uninstall.js b/browser/components/extensions/test/browser/browser_ext_contextMenus_uninstall.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_contextMenus_uninstall.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_contextMenus_uninstall.js
|
|
|
+@@ -75,10 +75,10 @@ add_task(async function() {
|
|
|
+ contextMenu = await openContextMenu("#img1");
|
|
|
+
|
|
|
+ // Confirm that no extension menu items exist.
|
|
|
+ topLevelExtensionMenuItems = contextMenu.getElementsByAttribute("ext-type", "top-level-menu");
|
|
|
+ is(topLevelExtensionMenuItems.length, 0, "no top level extension menu items should exist");
|
|
|
+
|
|
|
+ await closeContextMenu();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_contextMenus_urlPatterns.js b/browser/components/extensions/test/browser/browser_ext_contextMenus_urlPatterns.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_contextMenus_urlPatterns.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_contextMenus_urlPatterns.js
|
|
|
+@@ -259,10 +259,10 @@ add_task(async function() {
|
|
|
+ expected = [
|
|
|
+ ["documentUrlPatterns-patternMatches-contextAll", true],
|
|
|
+ ["documentUrlPatterns-patternMatches-contextFrame", true],
|
|
|
+ ];
|
|
|
+ await confirmContextMenuItems(contextMenu, expected);
|
|
|
+ await closeContextMenu();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow.js b/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow.js
|
|
|
+@@ -122,17 +122,17 @@ add_task(async function test_devtools_in
|
|
|
+ "Got the expected tabId from devtool.inspectedWindow.tabId called in a devtool_page iframe");
|
|
|
+
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_devtools_inspectedWindow_eval() {
|
|
|
+ const TEST_TARGET_URL = "http://mochi.test:8888/";
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_TARGET_URL);
|
|
|
+
|
|
|
+ function devtools_page() {
|
|
|
+ browser.test.onMessage.addListener(async (msg, ...args) => {
|
|
|
+@@ -244,17 +244,17 @@ add_task(async function test_devtools_in
|
|
|
+ }
|
|
|
+
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * This test asserts that both the page and the panel can use devtools.inspectedWindow.
|
|
|
+ * See regression in Bug https://bugzilla.mozilla.org/show_bug.cgi?id=1392531
|
|
|
+ */
|
|
|
+ add_task(async function test_devtools_inspectedWindow_eval_in_page_and_panel() {
|
|
|
+ const TEST_TARGET_URL = "http://mochi.test:8888/";
|
|
|
+@@ -362,10 +362,10 @@ add_task(async function test_devtools_in
|
|
|
+ info("Wait for response from the panel");
|
|
|
+ ({evalResult} = await extension.awaitMessage(`inspectedWindow-panel-eval-result`));
|
|
|
+ Assert.deepEqual(evalResult, TEST_TARGET_URL, "Got the expected eval result in the panel");
|
|
|
+
|
|
|
+ // Cleanup
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+ await target.destroy();
|
|
|
+ await extension.unload();
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_eval_bindings.js b/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_eval_bindings.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_eval_bindings.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_eval_bindings.js
|
|
|
+@@ -184,10 +184,10 @@ add_task(async function test_devtools_in
|
|
|
+ info("Split console has been opened as expected");
|
|
|
+
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_reload.js b/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_reload.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_reload.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_reload.js
|
|
|
+@@ -49,17 +49,17 @@ async function runReloadTestCase({urlPar
|
|
|
+
|
|
|
+ // Run the test case.
|
|
|
+ await testCase(extension);
|
|
|
+
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function test_devtools_inspectedWindow_reload_ignore_cache() {
|
|
|
+ function background() {
|
|
|
+ // Wait until the devtools page is ready to run the test.
|
|
|
+ browser.runtime.onMessage.addListener(async (msg) => {
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_devtools_network.js b/browser/components/extensions/test/browser/browser_ext_devtools_network.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_devtools_network.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_devtools_network.js
|
|
|
+@@ -138,17 +138,17 @@ add_task(async function test_devtools_ne
|
|
|
+ await extension.awaitMessage("tabUpdated");
|
|
|
+
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for `chrome.devtools.network.getHAR()` API
|
|
|
+ */
|
|
|
+ add_task(async function test_devtools_network_get_har() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://mochi.test:8888/");
|
|
|
+ let extension = ExtensionTestUtils.loadExtension(extData);
|
|
|
+@@ -193,17 +193,17 @@ add_task(async function test_devtools_ne
|
|
|
+
|
|
|
+ // Shutdown
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for `chrome.devtools.network.onRequestFinished()` API
|
|
|
+ */
|
|
|
+ add_task(async function test_devtools_network_on_request_finished() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://mochi.test:8888/");
|
|
|
+ let extension = ExtensionTestUtils.loadExtension(extData);
|
|
|
+@@ -246,10 +246,10 @@ add_task(async function test_devtools_ne
|
|
|
+
|
|
|
+ // Shutdown
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_devtools_page.js b/browser/components/extensions/test/browser/browser_ext_devtools_page.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_devtools_page.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_devtools_page.js
|
|
|
+@@ -149,17 +149,17 @@ add_task(async function test_devtools_pa
|
|
|
+ await extension.awaitMessage("content_script_port_received");
|
|
|
+
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * This test file ensures that:
|
|
|
+ *
|
|
|
+ * - the devtools_page can exchange messages with an extension tab page
|
|
|
+ */
|
|
|
+
|
|
|
+@@ -272,10 +272,10 @@ add_task(async function test_devtools_pa
|
|
|
+ await extension.awaitMessage("extension_tab_port_received");
|
|
|
+
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_devtools_panel.js b/browser/components/extensions/test/browser/browser_ext_devtools_panel.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_devtools_panel.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_devtools_panel.js
|
|
|
+@@ -85,17 +85,17 @@ add_task(async function test_theme_name_
|
|
|
+
|
|
|
+ await testThemeSwitching(extension);
|
|
|
+
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_devtools_page_panels_create() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://mochi.test:8888/");
|
|
|
+
|
|
|
+ async function devtools_page() {
|
|
|
+ const result = {
|
|
|
+ devtoolsPageTabId: browser.devtools.inspectedWindow.tabId,
|
|
|
+@@ -298,17 +298,17 @@ add_task(async function test_devtools_pa
|
|
|
+ is(toolToggledResults.panelShown, 3, "panel.onShown listener has been called three times");
|
|
|
+ is(toolToggledResults.panelHidden, 3, "panel.onHidden listener has been called three times");
|
|
|
+
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_devtools_page_panels_switch_toolbox_host() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://mochi.test:8888/");
|
|
|
+
|
|
|
+ function devtools_panel() {
|
|
|
+ const hasDevToolsAPINamespace = "devtools" in browser;
|
|
|
+
|
|
|
+@@ -422,17 +422,17 @@ add_task(async function test_devtools_pa
|
|
|
+ await extension.awaitMessage("devtools_panel_shown");
|
|
|
+ await extension.awaitMessage("devtools_panel_loaded");
|
|
|
+
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_devtools_page_invalid_panel_urls() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://mochi.test:8888/");
|
|
|
+
|
|
|
+ async function devtools_page() {
|
|
|
+ const matchInvalidPanelURL = /must be a relative URL/;
|
|
|
+ const matchInvalidIconURL = /be one of \[""\], or match the format "strictRelativeUrl"/;
|
|
|
+@@ -554,10 +554,10 @@ add_task(async function test_devtools_pa
|
|
|
+
|
|
|
+ await extension.awaitMessage("test_invalid_devtools_panel_urls_done");
|
|
|
+
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_devtools_panels_elements.js b/browser/components/extensions/test/browser/browser_ext_devtools_panels_elements.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_devtools_panels_elements.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_devtools_panels_elements.js
|
|
|
+@@ -115,10 +115,10 @@ add_task(async function test_devtools_pa
|
|
|
+ "Got the expected onSelectionChanged once the tab has been completely reloaded");
|
|
|
+
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_devtools_panels_elements_sidebar.js b/browser/components/extensions/test/browser/browser_ext_devtools_panels_elements_sidebar.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_devtools_panels_elements_sidebar.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_devtools_panels_elements_sidebar.js
|
|
|
+@@ -170,10 +170,10 @@ add_task(async function test_devtools_pa
|
|
|
+
|
|
|
+ is(inspector.sidebar.getTabPanel(sidebarIds[2]), undefined,
|
|
|
+ "The third registered sidebar has been removed");
|
|
|
+
|
|
|
+ await gDevTools.closeToolbox(target);
|
|
|
+
|
|
|
+ await target.destroy();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_find.js.1442465-4_2.later b/browser/components/extensions/test/browser/browser_ext_find.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_find.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,14 @@
|
|
|
++--- browser_ext_find.js
|
|
|
+++++ browser_ext_find.js
|
|
|
++@@ -175,10 +175,10 @@ add_task(async function testAboutFind()
|
|
|
++ "permissions": ["find", "tabs"],
|
|
|
++ },
|
|
|
++ background,
|
|
|
++ });
|
|
|
++
|
|
|
++ await extension.startup();
|
|
|
++ await extension.awaitMessage("done");
|
|
|
++ await extension.unload();
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_menus.js b/browser/components/extensions/test/browser/browser_ext_menus.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_menus.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_menus.js
|
|
|
+@@ -90,17 +90,17 @@ add_task(async function test_actionConte
|
|
|
+ is(separator.tagName, "menuseparator", "Separator after last menu item");
|
|
|
+
|
|
|
+ await closeActionContextMenu(popup.firstChild);
|
|
|
+ const {info, tab} = await extension.awaitMessage("click");
|
|
|
+ is(info.pageUrl, "http://example.com/", "Click info pageUrl is correct");
|
|
|
+ is(tab.id, tabId, "Click event tab ID is correct");
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_tabContextMenu() {
|
|
|
+ const first = ExtensionTestUtils.loadExtension({
|
|
|
+ manifest: {
|
|
|
+ permissions: ["menus"],
|
|
|
+ },
|
|
|
+@@ -163,17 +163,17 @@ add_task(async function test_tabContextM
|
|
|
+ is(beta.label, "beta", "Second menu item label is correct");
|
|
|
+
|
|
|
+ await closeTabContextMenu(beta);
|
|
|
+ const click = await first.awaitMessage("click");
|
|
|
+ is(click.info.pageUrl, "http://example.com/", "Click info pageUrl is correct");
|
|
|
+ is(click.tab.id, tabId, "Click event tab ID is correct");
|
|
|
+ is(click.info.frameId, undefined, "no frameId on chrome");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await first.unload();
|
|
|
+ await second.unload();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_onclick_frameid() {
|
|
|
+ const manifest = {
|
|
|
+ permissions: ["menus"],
|
|
|
+ };
|
|
|
+@@ -201,17 +201,17 @@ add_task(async function test_onclick_fra
|
|
|
+ }
|
|
|
+
|
|
|
+ let info = await click("body");
|
|
|
+ is(info.frameId, 0, "top level click");
|
|
|
+ info = await click("frame");
|
|
|
+ isnot(info.frameId, undefined, "frame click, frameId is not undefined");
|
|
|
+ isnot(info.frameId, 0, "frame click, frameId probably okay");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_multiple_contexts_init() {
|
|
|
+ const manifest = {
|
|
|
+ permissions: ["menus"],
|
|
|
+ };
|
|
|
+
|
|
|
+@@ -247,17 +247,17 @@ add_task(async function test_multiple_co
|
|
|
+
|
|
|
+ const popup = await openSubmenu(items[0]);
|
|
|
+ is(popup.firstChild.label, "child", "Correct child menu item");
|
|
|
+ await closeExtensionContextMenu(popup.firstChild);
|
|
|
+
|
|
|
+ const info = await extension.awaitMessage("click");
|
|
|
+ is(info.menuItemId, "child", "onClicked the correct item");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_tools_menu() {
|
|
|
+ const first = ExtensionTestUtils.loadExtension({
|
|
|
+ manifest: {
|
|
|
+ permissions: ["menus"],
|
|
|
+ },
|
|
|
+@@ -302,12 +302,12 @@ add_task(async function test_tools_menu(
|
|
|
+ is(gamma.getAttribute("label"), "gamma", "Third menu item label is correct");
|
|
|
+
|
|
|
+ closeToolsMenu(gamma);
|
|
|
+
|
|
|
+ const click = await second.awaitMessage("click");
|
|
|
+ is(click.info.pageUrl, "http://example.com/", "Click info pageUrl is correct");
|
|
|
+ is(click.tab.id, tabId, "Click event tab ID is correct");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await first.unload();
|
|
|
+ await second.unload();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_menus.js.1442465-4_2.later b/browser/components/extensions/test/browser/browser_ext_menus.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_menus.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_ext_menus.js
|
|
|
+++++ browser_ext_menus.js
|
|
|
++@@ -148,17 +148,17 @@ add_task(async function test_hiddenPageA
|
|
|
++
|
|
|
++ is(dontShowItem.label, "Don\u2019t Show in Address Bar", "Correct first child");
|
|
|
++ is(separator.tagName, "menuseparator", "Correct second child");
|
|
|
++ is(manageItem.label, "Manage Extension\u2026", "Correct third child");
|
|
|
++
|
|
|
++ await closeChromeContextMenu(menu.id);
|
|
|
++ await closeChromeContextMenu(BrowserPageActions.panelNode.id);
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ await extension.unload();
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function test_tabContextMenu() {
|
|
|
++ const first = ExtensionTestUtils.loadExtension({
|
|
|
++ manifest: {
|
|
|
++ permissions: ["menus"],
|
|
|
++ },
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_menus_event_order.js.1442465-4_2.later b/browser/components/extensions/test/browser/browser_ext_menus_event_order.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_menus_event_order.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,14 @@
|
|
|
++--- browser_ext_menus_event_order.js
|
|
|
+++++ browser_ext_menus_event_order.js
|
|
|
++@@ -72,10 +72,10 @@ add_task(async function test_menus_click
|
|
|
++ const menu = await openToolsMenu();
|
|
|
++ let menuitem = menu.querySelector("menuitem[label='item in tools menu']");
|
|
|
++ ok(menuitem, "Tools menu item should exist");
|
|
|
++ await closeToolsMenu(menuitem);
|
|
|
++ await verifyResults("tools_menu");
|
|
|
++ }
|
|
|
++
|
|
|
++ await extension.unload();
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_menus_events.js.1442465-4_2.later b/browser/components/extensions/test/browser/browser_ext_menus_events.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_menus_events.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_ext_menus_events.js
|
|
|
+++++ browser_ext_menus_events.js
|
|
|
++@@ -115,17 +115,17 @@ async function testShowHideEvent({menuCr
|
|
|
++ extension.sendMessage("optional-menu-shown-with-permissions");
|
|
|
++ let shownEvent2 = await extension.awaitMessage("onShown-event-data2");
|
|
|
++ Assert.deepEqual(shownEvent2, expectedShownEventWithPermissions,
|
|
|
++ "expected onShown info when host permissions are enabled");
|
|
|
++ await doCloseMenu();
|
|
|
++ }
|
|
|
++
|
|
|
++ await extension.unload();
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ }
|
|
|
++
|
|
|
++ // Make sure that we won't trigger onShown when extensions cannot add menus.
|
|
|
++ add_task(async function test_no_show_hide_for_unsupported_menu() {
|
|
|
++ let extension = ExtensionTestUtils.loadExtension({
|
|
|
++ background() {
|
|
|
++ let events = [];
|
|
|
++ browser.menus.onShown.addListener(data => events.push(data));
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_menus_refresh.js.1442465-4_2.later b/browser/components/extensions/test/browser/browser_ext_menus_refresh.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_menus_refresh.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,71 @@
|
|
|
++--- browser_ext_menus_refresh.js
|
|
|
+++++ browser_ext_menus_refresh.js
|
|
|
++@@ -175,17 +175,17 @@ add_task(async function refresh_menus_wi
|
|
|
++ contexts: ["tab"],
|
|
|
++ async doOpenMenu() {
|
|
|
++ await openTabContextMenu();
|
|
|
++ },
|
|
|
++ async doCloseMenu() {
|
|
|
++ await closeTabContextMenu();
|
|
|
++ },
|
|
|
++ });
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function refresh_menus_with_tools_menu() {
|
|
|
++ await testRefreshMenusWhileVisible({
|
|
|
++ contexts: ["tools_menu"],
|
|
|
++ async doOpenMenu() {
|
|
|
++ await openToolsMenu();
|
|
|
++ },
|
|
|
++@@ -201,17 +201,17 @@ add_task(async function refresh_menus_wi
|
|
|
++ contexts: ["page"],
|
|
|
++ async doOpenMenu() {
|
|
|
++ await openContextMenu("body");
|
|
|
++ },
|
|
|
++ async doCloseMenu() {
|
|
|
++ await closeExtensionContextMenu();
|
|
|
++ },
|
|
|
++ });
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function refresh_without_menus_at_onShown() {
|
|
|
++ const tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, PAGE);
|
|
|
++ let extension = loadExtensionWithMenusApi();
|
|
|
++ await extension.startup();
|
|
|
++
|
|
|
++ const doOpenMenu = () => openContextMenu("body");
|
|
|
++@@ -238,17 +238,17 @@ add_task(async function refresh_without_
|
|
|
++ await doCloseMenu();
|
|
|
++ await doOpenMenu();
|
|
|
++ await extension.awaitMessage("onShown fired");
|
|
|
++ elem = extension.getXULElementByMenuId("too late");
|
|
|
++ is(elem.getAttribute("label"), "the menu item", "previously registered item");
|
|
|
++ await doCloseMenu();
|
|
|
++
|
|
|
++ await extension.unload();
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function refresh_menus_with_browser_action() {
|
|
|
++ let extension = loadExtensionWithMenusApi();
|
|
|
++ let other_extension = loadExtensionWithMenusApi();
|
|
|
++ await extension.startup();
|
|
|
++ await other_extension.startup();
|
|
|
++
|
|
|
++@@ -339,10 +339,10 @@ add_task(async function refresh_menus_du
|
|
|
++ // should be used.
|
|
|
++ elem = extension.getXULElementByMenuId("item1");
|
|
|
++ is(elem, null, "menu item 1 should be hidden");
|
|
|
++ elem = extension.getXULElementByMenuId("item2");
|
|
|
++ is(elem.getAttribute("label"), "item2", "menu item 2 should be shown");
|
|
|
++
|
|
|
++ await closeActionContextMenu();
|
|
|
++ await extension.unload();
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_openPanel.js b/browser/components/extensions/test/browser/browser_ext_openPanel.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_openPanel.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_openPanel.js
|
|
|
+@@ -116,24 +116,24 @@ add_task(async function test_openPopup_r
|
|
|
+ closePageAction(extension);
|
|
|
+ await new Promise(resolve => setTimeout(resolve, 0));
|
|
|
+
|
|
|
+ await click("#openSidebarAction");
|
|
|
+
|
|
|
+ await BrowserTestUtils.synthesizeMouseAtCenter("#closeSidebarAction", {}, gBrowser.selectedBrowser);
|
|
|
+ await BrowserTestUtils.waitForCondition(() => !SidebarUI.isOpen);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+ extensionData.manifest.permissions = ["activeTab"];
|
|
|
+ extension = ExtensionTestUtils.loadExtension(extensionData);
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitMessage("ready");
|
|
|
+
|
|
|
+ await click("#openBrowserAction");
|
|
|
+ testActiveTab(extension, true);
|
|
|
+ closeBrowserAction(extension);
|
|
|
+ await new Promise(resolve => setTimeout(resolve, 0));
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_optionsPage_browser_style.js b/browser/components/extensions/test/browser/browser_ext_optionsPage_browser_style.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_optionsPage_browser_style.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_optionsPage_browser_style.js
|
|
|
+@@ -93,17 +93,17 @@ async function testOptionsBrowserStyle(o
|
|
|
+
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitMessage("options-ui-ready");
|
|
|
+
|
|
|
+ extension.sendMessage("check-style", optionsUI, assertMessage);
|
|
|
+ await extension.awaitFinish("options-ui-browser_style");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function test_options_without_setting_browser_style() {
|
|
|
+ await testOptionsBrowserStyle({
|
|
|
+ "page": "options.html",
|
|
|
+ }, "Expected correct style when browser_style is excluded");
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_optionsPage_modals.js b/browser/components/extensions/test/browser/browser_ext_optionsPage_modals.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_optionsPage_modals.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_optionsPage_modals.js
|
|
|
+@@ -76,12 +76,12 @@ add_task(async function test_tab_options
|
|
|
+ info("Close the tab modal prompt");
|
|
|
+ dialogs[0].onButtonClick(0);
|
|
|
+
|
|
|
+ await extension.awaitFinish("options-ui-modals");
|
|
|
+
|
|
|
+ Assert.equal(stack.querySelectorAll("tabmodalprompt").length, 0,
|
|
|
+ "Expect the tab modal to be closed");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_optionsPage_privileges.js b/browser/components/extensions/test/browser/browser_ext_optionsPage_privileges.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_optionsPage_privileges.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_optionsPage_privileges.js
|
|
|
+@@ -57,10 +57,10 @@ add_task(async function test_tab_options
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://example.com/");
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+
|
|
|
+ await extension.awaitFinish("options-ui-privileges");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_pageAction_context.js.1442465-4_2.later b/browser/components/extensions/test/browser/browser_ext_pageAction_context.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_pageAction_context.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,16 @@
|
|
|
++--- browser_ext_pageAction_context.js
|
|
|
+++++ browser_ext_pageAction_context.js
|
|
|
++@@ -282,12 +282,12 @@ add_task(async function testNavigationCl
|
|
|
++ info("Set tab-specific data.");
|
|
|
++ await setTabSpecificData();
|
|
|
++
|
|
|
++ info("Push history state. Does not cause navigation.");
|
|
|
++ await historyPushState(url + "/path");
|
|
|
++ await expectTabSpecificData("history.pushState() does not clear tab-specific data");
|
|
|
++
|
|
|
++ for (let tab of tabs) {
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ }
|
|
|
++ await extension.unload();
|
|
|
++ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_pageAction_popup.js b/browser/components/extensions/test/browser/browser_ext_pageAction_popup.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_pageAction_popup.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_pageAction_popup.js
|
|
|
+@@ -193,17 +193,17 @@ add_task(async function testPageActionPo
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+ let node = document.getElementById(pageActionId);
|
|
|
+ is(node, null, "pageAction image removed from document");
|
|
|
+
|
|
|
+ let panel = document.getElementById(panelId);
|
|
|
+ is(panel, null, "pageAction panel removed from document");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
+ add_task(async function testPageActionSecurity() {
|
|
|
+ const URL = "chrome://browser/content/browser.xul";
|
|
|
+
|
|
|
+ let apis = ["browser_action", "page_action"];
|
|
|
+
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_pageAction_show_matches.js.1442465-4_2.later b/browser/components/extensions/test/browser/browser_ext_pageAction_show_matches.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_pageAction_show_matches.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,66 @@
|
|
|
++--- browser_ext_pageAction_show_matches.js
|
|
|
+++++ browser_ext_pageAction_show_matches.js
|
|
|
++@@ -99,21 +99,21 @@ add_task(async function test_pageAction_
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, url, true, true);
|
|
|
++ await check(extension, tab, expected, msg + " (new)");
|
|
|
++
|
|
|
++ info("Check switched tab.");
|
|
|
++ await BrowserTestUtils.switchTab(gBrowser, switchTab);
|
|
|
++ await BrowserTestUtils.switchTab(gBrowser, tab);
|
|
|
++ await check(extension, tab, expected, msg + " (switched)");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ }
|
|
|
++ await extension.unload();
|
|
|
++ }
|
|
|
++- await BrowserTestUtils.removeTab(switchTab);
|
|
|
+++ BrowserTestUtils.removeTab(switchTab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function test_pageAction_default_show_install() {
|
|
|
++ info("Check show_matches and hide_matches are respected when installing the extension");
|
|
|
++ for (let [i, test] of tests.entries()) {
|
|
|
++ info(`test ${i}: ${test.name}`);
|
|
|
++ for (let expected of [true, false]) {
|
|
|
++ let j = test.shown.indexOf(expected);
|
|
|
++@@ -124,18 +124,18 @@ add_task(async function test_pageAction_
|
|
|
++ await extension.startup();
|
|
|
++ let msg = `test ${i} url ${j}: page action is ${expected ? "shown" : "hidden"} for ${urls[j]}`;
|
|
|
++ await check(extension, installTab, expected, msg + " (active)");
|
|
|
++
|
|
|
++ // initialTab has not been activated after installation, so we have not evaluated whether the page
|
|
|
++ // action should be shown in it. Check that pageAction.isShown works anyways.
|
|
|
++ await sendMessage(extension, "isShown", {tabId: getId(initialTab)}, expected, msg + " (inactive)");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(initialTab);
|
|
|
++- await BrowserTestUtils.removeTab(installTab);
|
|
|
+++ BrowserTestUtils.removeTab(initialTab);
|
|
|
+++ BrowserTestUtils.removeTab(installTab);
|
|
|
++ await extension.unload();
|
|
|
++ }
|
|
|
++ }
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function test_pageAction_history() {
|
|
|
++ info("Check match patterns are reevaluated when using history.pushState");
|
|
|
++ let url1 = "http://example.com/";
|
|
|
++@@ -155,17 +155,17 @@ add_task(async function test_pageAction_
|
|
|
++ info("Use hide()");
|
|
|
++ await sendMessage(extension, "hide", getId(tab));
|
|
|
++ await check(extension, tab, false, "page action is still hidden");
|
|
|
++
|
|
|
++ info("Use history.pushState to revert to first url");
|
|
|
++ await historyPushState(tab, url1);
|
|
|
++ await check(extension, tab, false, "hide() has more precedence than pattern matching");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ await extension.unload();
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function test_pageAction_all_urls() {
|
|
|
++ info("Check <all_urls> is not allowed in hide_matches");
|
|
|
++ let extension = getExtension({
|
|
|
++ "show_matches": ["*://mochi.test/*"],
|
|
|
++ "hide_matches": ["<all_urls>"],
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_popup_focus.js.1442465-4_2.later b/browser/components/extensions/test/browser/browser_ext_popup_focus.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_popup_focus.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,34 @@
|
|
|
++--- browser_ext_popup_focus.js
|
|
|
+++++ browser_ext_popup_focus.js
|
|
|
++@@ -29,17 +29,17 @@ add_task(async function testPageActionFo
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, DUMMY_PAGE);
|
|
|
++
|
|
|
++ await extension.startup();
|
|
|
++ let finish = extension.awaitFinish("focused");
|
|
|
++ await clickPageAction(extension);
|
|
|
++ await finish;
|
|
|
++ await closePageAction(extension);
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ await extension.unload();
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function testBrowserActionFocus() {
|
|
|
++ let extension = ExtensionTestUtils.loadExtension({
|
|
|
++ manifest: {
|
|
|
++ "browser_action": {"default_popup": "popup.html"},
|
|
|
++ },
|
|
|
++@@ -61,11 +61,11 @@ add_task(async function testBrowserActio
|
|
|
++
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, DUMMY_PAGE);
|
|
|
++ let finish = extension.awaitFinish("focused");
|
|
|
++ await clickBrowserAction(extension);
|
|
|
++ await finish;
|
|
|
++
|
|
|
++ await closeBrowserAction(extension);
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ await extension.unload();
|
|
|
++ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_runtime_openOptionsPage.js b/browser/components/extensions/test/browser/browser_ext_runtime_openOptionsPage.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_runtime_openOptionsPage.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_runtime_openOptionsPage.js
|
|
|
+@@ -204,17 +204,17 @@ add_tasks(async function test_inline_opt
|
|
|
+ ]);
|
|
|
+
|
|
|
+ extension.sendMessage("ports-done");
|
|
|
+
|
|
|
+ await extension.awaitFinish("options-ui");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_tasks(async function test_tab_options(extraOptions) {
|
|
|
+ info(`Test options opened in a tab (${JSON.stringify(extraOptions)})`);
|
|
|
+
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://example.com/");
|
|
|
+
|
|
|
+ let extension = await loadExtension(Object.assign({}, extraOptions, {
|
|
|
+@@ -307,17 +307,17 @@ add_tasks(async function test_tab_option
|
|
|
+ browser.test.notifyFail("options-ui-tab");
|
|
|
+ }
|
|
|
+ },
|
|
|
+ }));
|
|
|
+
|
|
|
+ await extension.awaitFinish("options-ui-tab");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_tasks(async function test_options_no_manifest(extraOptions) {
|
|
|
+ info(`Test with no manifest key (${JSON.stringify(extraOptions)})`);
|
|
|
+
|
|
|
+ let extension = await loadExtension(Object.assign({}, extraOptions, {
|
|
|
+ manifest: {
|
|
|
+ applications: {gecko: {id: "no_options@tests.mozilla.org"}},
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_runtime_openOptionsPage_uninstall.js b/browser/components/extensions/test/browser/browser_ext_runtime_openOptionsPage_uninstall.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_runtime_openOptionsPage_uninstall.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_runtime_openOptionsPage_uninstall.js
|
|
|
+@@ -90,12 +90,12 @@ add_task(async function test_inline_opti
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.awaitMessage("options-ui-open");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+ is(gBrowser.selectedBrowser.currentURI.spec, "about:addons",
|
|
|
+ "Add-on manager tab should still be open");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_runtime_setUninstallURL.js b/browser/components/extensions/test/browser/browser_ext_runtime_setUninstallURL.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_runtime_setUninstallURL.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_runtime_setUninstallURL.js
|
|
|
+@@ -18,17 +18,17 @@ async function makeAndInstallXPI(id, bac
|
|
|
+
|
|
|
+ info(`installing ${xpi.path}`);
|
|
|
+ let addon = await AddonManager.installTemporaryAddon(xpi);
|
|
|
+ info("installed");
|
|
|
+
|
|
|
+ // A WebExtension is started asynchronously, we have our test extension
|
|
|
+ // open a new tab to signal that the background script has executed.
|
|
|
+ let loadTab = await loadPromise;
|
|
|
+- await BrowserTestUtils.removeTab(loadTab);
|
|
|
++ BrowserTestUtils.removeTab(loadTab);
|
|
|
+
|
|
|
+ return addon;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ add_task(async function test_setuninstallurl_badargs() {
|
|
|
+ async function background() {
|
|
|
+ await browser.test.assertRejects(
|
|
|
+@@ -85,10 +85,10 @@ add_task(async function test_setuninstal
|
|
|
+ // look for a new tab with the uninstall url.
|
|
|
+ let uninstallPromise = BrowserTestUtils.waitForNewTab(gBrowser, "http://example.com/addon_uninstalled");
|
|
|
+
|
|
|
+ addon.uninstall(true);
|
|
|
+ info("uninstalled");
|
|
|
+
|
|
|
+ let uninstalledTab = await uninstallPromise;
|
|
|
+ isnot(uninstalledTab, null, "opened tab with uninstall url");
|
|
|
+- await BrowserTestUtils.removeTab(uninstalledTab);
|
|
|
++ BrowserTestUtils.removeTab(uninstalledTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed.js b/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed.js
|
|
|
+@@ -59,20 +59,20 @@ add_task(async function test_sessions_ge
|
|
|
+
|
|
|
+ await openAndCloseWindow("about:config", ["about:robots", "about:mozilla"]);
|
|
|
+ extension.sendMessage("check-sessions");
|
|
|
+ recentlyClosed = await extension.awaitMessage("recentlyClosed");
|
|
|
+ // Check for multiple tabs in most recently closed window
|
|
|
+ is(recentlyClosed[0].window.tabs.length, 3, "most recently closed window has the expected number of tabs");
|
|
|
+
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://example.com");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://example.com");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ await openAndCloseWindow();
|
|
|
+ extension.sendMessage("check-sessions");
|
|
|
+ recentlyClosed = await extension.awaitMessage("recentlyClosed");
|
|
|
+ let finalResult = recentlyClosed.filter(onlyNewItemsFilter);
|
|
|
+ checkRecentlyClosed(finalResult, 5, currentWindowId);
|
|
|
+
|
|
|
+ isnot(finalResult[0].window, undefined, "first item is a window");
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_tabs.js b/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_tabs.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_tabs.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_tabs.js
|
|
|
+@@ -65,17 +65,17 @@ add_task(async function test_sessions_ge
|
|
|
+ tab = await BrowserTestUtils.openNewForegroundTab(win.gBrowser, url);
|
|
|
+ expectedTabs.push(expectedTabInfo(tab, win));
|
|
|
+ lastAccessedTimes.set(url, tab.lastAccessed);
|
|
|
+ }
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+
|
|
|
+ // Test with a closed tab.
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ extension.sendMessage("check-sessions");
|
|
|
+ let recentlyClosed = await extension.awaitMessage("recentlyClosed");
|
|
|
+ let tabInfo = recentlyClosed[0].tab;
|
|
|
+ let expectedTab = expectedTabs.pop();
|
|
|
+ checkTabInfo(expectedTab, tabInfo);
|
|
|
+ ok(tabInfo.lastAccessed > lastAccessedTimes.get(tabInfo.url),
|
|
|
+ "lastAccessed has been updated");
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_sessions_restore.js b/browser/components/extensions/test/browser/browser_ext_sessions_restore.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_sessions_restore.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_sessions_restore.js
|
|
|
+@@ -111,47 +111,47 @@ add_task(async function test_sessions_re
|
|
|
+ window = windowTracker.getWindow(restored.window.id);
|
|
|
+ await BrowserTestUtils.closeWindow(window);
|
|
|
+ // notificationCount = yield extension.awaitMessage("notificationCount");
|
|
|
+ await assertNotificationCount(5);
|
|
|
+
|
|
|
+ // Open and close a tab.
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:robots");
|
|
|
+ await TabStateFlusher.flush(tab.linkedBrowser);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await assertNotificationCount(6);
|
|
|
+
|
|
|
+ // Restore the most recently closed item.
|
|
|
+ extension.sendMessage("restore");
|
|
|
+ await assertNotificationCount(7);
|
|
|
+ restored = await extension.awaitMessage("restored");
|
|
|
+
|
|
|
+ tab = restored.tab;
|
|
|
+ ok(tab, "restore returned a tab");
|
|
|
+ checkLocalTab(tab, "about:robots");
|
|
|
+
|
|
|
+ // Close the tab again.
|
|
|
+ let realTab = tabTracker.getTab(tab.id);
|
|
|
+- await BrowserTestUtils.removeTab(realTab);
|
|
|
++ BrowserTestUtils.removeTab(realTab);
|
|
|
+ await assertNotificationCount(8);
|
|
|
+
|
|
|
+ // Restore the tab using the sessionId.
|
|
|
+ extension.sendMessage("check-sessions");
|
|
|
+ recentlyClosed = await extension.awaitMessage("recentlyClosed");
|
|
|
+ extension.sendMessage("restore", recentlyClosed[0].tab.sessionId);
|
|
|
+ await assertNotificationCount(9);
|
|
|
+ restored = await extension.awaitMessage("restored");
|
|
|
+
|
|
|
+ tab = restored.tab;
|
|
|
+ ok(tab, "restore returned a tab");
|
|
|
+ checkLocalTab(tab, "about:robots");
|
|
|
+
|
|
|
+ // Close the tab again.
|
|
|
+ realTab = tabTracker.getTab(tab.id);
|
|
|
+- await BrowserTestUtils.removeTab(realTab);
|
|
|
++ BrowserTestUtils.removeTab(realTab);
|
|
|
+ await assertNotificationCount(10);
|
|
|
+
|
|
|
+ // Try to restore something with an invalid sessionId.
|
|
|
+ extension.sendMessage("restore-reject");
|
|
|
+ restored = await extension.awaitMessage("restore-rejected");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_sidebarAction_browser_style.js b/browser/components/extensions/test/browser/browser_ext_sidebarAction_browser_style.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_sidebarAction_browser_style.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_sidebarAction_browser_style.js
|
|
|
+@@ -45,17 +45,17 @@ async function testSidebarBrowserStyle(s
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitMessage("sidebar-ready");
|
|
|
+
|
|
|
+ extension.sendMessage("check-style", sidebarAction, assertMessage);
|
|
|
+ await extension.awaitFinish("sidebar-browser-style");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function test_sidebar_without_setting_browser_style() {
|
|
|
+ await testSidebarBrowserStyle({
|
|
|
+ "default_panel": "panel.html",
|
|
|
+ }, "Expected correct style when browser_style is excluded");
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_slow_script.js b/browser/components/extensions/test/browser/browser_ext_slow_script.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_slow_script.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_slow_script.js
|
|
|
+@@ -50,12 +50,12 @@ add_task(async function test_slow_conten
|
|
|
+ let text = document.getAnonymousElementByAttribute(notification, "anonid", "messageText").textContent;
|
|
|
+
|
|
|
+ ok(text.includes("\u201cSlow Script Extension\u201d"),
|
|
|
+ "Label is correct");
|
|
|
+
|
|
|
+ let stopButton = notification.querySelector("[label='Stop It']");
|
|
|
+ stopButton.click();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tab_runtimeConnect.js b/browser/components/extensions/test/browser/browser_ext_tab_runtimeConnect.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tab_runtimeConnect.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tab_runtimeConnect.js
|
|
|
+@@ -65,10 +65,10 @@ add_task(async function() {
|
|
|
+ `,
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitFinish("tabRuntimeConnect.pass");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_audio.js b/browser/components/extensions/test/browser/browser_ext_tabs_audio.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_audio.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_audio.js
|
|
|
+@@ -191,11 +191,11 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+
|
|
|
+ await extension.awaitFinish("tab-audio");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_captureTab.js.1442465-4_2.later b/browser/components/extensions/test/browser/browser_ext_tabs_captureTab.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_captureTab.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_ext_tabs_captureTab.js
|
|
|
+++++ browser_ext_tabs_captureTab.js
|
|
|
++@@ -116,17 +116,17 @@ async function runTest(options) {
|
|
|
++ });
|
|
|
++
|
|
|
++ await extension.startup();
|
|
|
++
|
|
|
++ await extension.awaitFinish("captureTab");
|
|
|
++
|
|
|
++ await extension.unload();
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ }
|
|
|
++
|
|
|
++ add_task(async function testCaptureTab() {
|
|
|
++ await runTest({color: [0, 0, 0], fullZoom: 1});
|
|
|
++
|
|
|
++ await runTest({color: [0, 0, 0], fullZoom: 2});
|
|
|
++
|
|
|
++ await runTest({color: [0, 0, 0], fullZoom: 0.5});
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_captureVisibleTab.js b/browser/components/extensions/test/browser/browser_ext_tabs_captureVisibleTab.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_captureVisibleTab.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_captureVisibleTab.js
|
|
|
+@@ -116,17 +116,17 @@ async function runTest(options) {
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+
|
|
|
+ await extension.awaitFinish("captureVisibleTab");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function testCaptureVisibleTab() {
|
|
|
+ await runTest({color: [0, 0, 0], fullZoom: 1});
|
|
|
+
|
|
|
+ await runTest({color: [0, 0, 0], fullZoom: 2});
|
|
|
+
|
|
|
+ await runTest({color: [0, 0, 0], fullZoom: 0.5});
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_create.js b/browser/components/extensions/test/browser/browser_ext_tabs_create.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_create.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_create.js
|
|
|
+@@ -163,17 +163,17 @@ add_task(async function test_create_opti
|
|
|
+ },
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitFinish("tabs.create");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_urlbar_focus() {
|
|
|
+ const extension = ExtensionTestUtils.loadExtension({
|
|
|
+ background() {
|
|
|
+ browser.tabs.onUpdated.addListener(function onUpdated(_, info) {
|
|
|
+ if (info.status === "complete") {
|
|
|
+ browser.test.sendMessage("complete");
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_discard.js.1442465-4_2.later b/browser/components/extensions/test/browser/browser_ext_tabs_discard.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_discard.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,17 @@
|
|
|
++--- browser_ext_tabs_discard.js
|
|
|
+++++ browser_ext_tabs_discard.js
|
|
|
++@@ -51,12 +51,12 @@ add_task(async function test_discarded()
|
|
|
++ let tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://example.com");
|
|
|
++ let tab2 = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://example.com");
|
|
|
++
|
|
|
++ await extension.startup();
|
|
|
++
|
|
|
++ await extension.awaitFinish("test-finished");
|
|
|
++ await extension.unload();
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab1);
|
|
|
++- await BrowserTestUtils.removeTab(tab2);
|
|
|
+++ BrowserTestUtils.removeTab(tab1);
|
|
|
+++ BrowserTestUtils.removeTab(tab2);
|
|
|
++ });
|
|
|
++
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_discarded.js b/browser/components/extensions/test/browser/browser_ext_tabs_discarded.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_discarded.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_discarded.js
|
|
|
+@@ -55,12 +55,12 @@ add_task(async function test_discarded()
|
|
|
+ let tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://example.com");
|
|
|
+
|
|
|
+ let tab2 = BrowserTestUtils.addTab(gBrowser, "about:blank", {createLazyBrowser: true});
|
|
|
+ SessionStore.setTabState(tab2, JSON.stringify(lazyTabState));
|
|
|
+
|
|
|
+ await extension.awaitFinish("test-finished");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_duplicate.js b/browser/components/extensions/test/browser/browser_ext_tabs_duplicate.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_duplicate.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_duplicate.js
|
|
|
+@@ -31,17 +31,17 @@ add_task(async function testDuplicateTab
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitFinish("tabs.duplicate");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+ while (gBrowser.tabs[0].linkedBrowser.currentURI.spec === "http://example.net/") {
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.tabs[0]);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.tabs[0]);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function testDuplicateTabLazily() {
|
|
|
+ async function background() {
|
|
|
+ let tabLoadComplete = new Promise(resolve => {
|
|
|
+ browser.test.onMessage.addListener((message, tabId, result) => {
|
|
|
+ if (message == "duplicate-tab-done") {
|
|
|
+@@ -136,11 +136,11 @@ add_task(async function testDuplicatePin
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitFinish("tabs.duplicate.pinned");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+ while (gBrowser.tabs[0].linkedBrowser.currentURI.spec === "http://example.net/") {
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.tabs[0]);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.tabs[0]);
|
|
|
+ }
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript.js b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript.js
|
|
|
+@@ -245,15 +245,15 @@ add_task(async function testExecuteScrip
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+
|
|
|
+ await extension.awaitFinish("executeScript");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ // Make sure that we're not holding on to references to closed message
|
|
|
+ // managers.
|
|
|
+ is(countMM(MessageChannel.messageManagers), messageManagersSize, "Message manager count");
|
|
|
+ is(MessageChannel.pendingResponses.size, 0, "Pending response count");
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_bad.js b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_bad.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_bad.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_bad.js
|
|
|
+@@ -193,18 +193,18 @@ add_task(async function testBadPermissio
|
|
|
+ "page_action": {},
|
|
|
+ },
|
|
|
+ contentSetup: async function() {
|
|
|
+ let [tab] = await browser.tabs.query({active: true, currentWindow: true});
|
|
|
+ await browser.pageAction.show(tab.id);
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function testMatchDataURI() {
|
|
|
+ // allow top level data: URI navigations, otherwise
|
|
|
+ // window.location.href = data: would be blocked
|
|
|
+ await SpecialPowers.pushPrefEnv({
|
|
|
+ "set": [["security.data_uri.block_toplevel_data_uri_navigations", false]],
|
|
|
+ });
|
|
|
+@@ -274,17 +274,17 @@ add_task(async function testMatchDataURI
|
|
|
+ target.sendMessage("navigate", data);
|
|
|
+
|
|
|
+ const url = await scripts.awaitMessage("tab-ready");
|
|
|
+ is(url, data, "Extension tab navigated to a data: URI");
|
|
|
+
|
|
|
+ scripts.sendMessage("execute");
|
|
|
+ await scripts.awaitMessage("done");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ await scripts.unload();
|
|
|
+ await target.unload();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function testBadURL() {
|
|
|
+ async function background() {
|
|
|
+ let promises = [
|
|
|
+ new Promise(resolve => {
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_good.js b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_good.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_good.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_good.js
|
|
|
+@@ -235,12 +235,12 @@ add_task(async function testGoodPermissi
|
|
|
+ let item = contextMenu.querySelector("[label=activeTab]");
|
|
|
+
|
|
|
+ await EventUtils.synthesizeMouseAtCenter(item, {}, window);
|
|
|
+
|
|
|
+ await awaitPopupHidden;
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(forceGC);
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_multiple.js b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_multiple.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_multiple.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_multiple.js
|
|
|
+@@ -41,10 +41,10 @@ add_task(async function testExecuteScrip
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+
|
|
|
+ await extension.awaitFinish("executeScript-multiple");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_no_create.js b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_no_create.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_no_create.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_no_create.js
|
|
|
+@@ -58,10 +58,10 @@ add_task(async function testExecuteScrip
|
|
|
+ extension.sendMessage(URL);
|
|
|
+ await extension.awaitMessage("open-test-tab");
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, URL, true);
|
|
|
+
|
|
|
+ await extension.awaitFinish("executeScript-at-onUpdated");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_runAt.js b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_runAt.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_runAt.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_runAt.js
|
|
|
+@@ -110,10 +110,10 @@ add_task(async function testExecuteScrip
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+
|
|
|
+ await extension.awaitFinish("executeScript-runAt");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_hide.js.1442465-4_2.later b/browser/components/extensions/test/browser/browser_ext_tabs_hide.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_hide.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,35 @@
|
|
|
++--- browser_ext_tabs_hide.js
|
|
|
+++++ browser_ext_tabs_hide.js
|
|
|
++@@ -138,17 +138,17 @@ add_task(async function test_tabs_showhi
|
|
|
++ ok(tabs[i].hidden, "tab hidden value is correct");
|
|
|
++ let id = SessionStore.getTabValue(tabs[i], "hiddenBy");
|
|
|
++ is(id, extension.id, "tab hiddenBy value is correct");
|
|
|
++ }
|
|
|
++
|
|
|
++ // Test closing the last visible tab, the next tab which is hidden should become
|
|
|
++ // the selectedTab and will be visible.
|
|
|
++ ok(!otherwin.gBrowser.selectedTab.hidden, "selected tab is not hidden");
|
|
|
++- await BrowserTestUtils.removeTab(otherwin.gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(otherwin.gBrowser.selectedTab);
|
|
|
++ ok(!otherwin.gBrowser.selectedTab.hidden, "tab was unhidden");
|
|
|
++
|
|
|
++ // Showall will unhide any remaining hidden tabs.
|
|
|
++ extension.sendMessage("showall");
|
|
|
++ await extension.awaitMessage("shown");
|
|
|
++
|
|
|
++ // Check from chrome code that all tabs are visible again.
|
|
|
++ for (let win of BrowserWindowIterator()) {
|
|
|
++@@ -214,11 +214,11 @@ add_task(async function test_tabs_shutdo
|
|
|
++ extension.awaitMessage("ready"),
|
|
|
++ extension.awaitMessage("changeInfo"),
|
|
|
++ ]);
|
|
|
++ Assert.ok(tabs[0].hidden, "Tab is hidden by extension");
|
|
|
++
|
|
|
++ await extension.unload();
|
|
|
++
|
|
|
++ Assert.ok(!tabs[0].hidden, "Tab is not hidden after unloading extension");
|
|
|
++- await BrowserTestUtils.removeTab(tabs[0]);
|
|
|
++- await BrowserTestUtils.removeTab(tabs[1]);
|
|
|
+++ BrowserTestUtils.removeTab(tabs[0]);
|
|
|
+++ BrowserTestUtils.removeTab(tabs[1]);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_hide_update.js.1442465-4_2.later b/browser/components/extensions/test/browser/browser_ext_tabs_hide_update.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_hide_update.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,33 @@
|
|
|
++--- browser_ext_tabs_hide_update.js
|
|
|
+++++ browser_ext_tabs_hide_update.js
|
|
|
++@@ -103,17 +103,17 @@ add_task(async function test_tabs_update
|
|
|
++ },
|
|
|
++ permissions: ["tabs"],
|
|
|
++ };
|
|
|
++ await updateExtension(ID, extdata);
|
|
|
++ Assert.ok(!tab.hidden, "Tab is not hidden hidden after update");
|
|
|
++
|
|
|
++ await extension.unload();
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++
|
|
|
++ // Test our update handling. Currently this means any hidden tabs will be
|
|
|
++ // shown when a tabHide extension is shutdown. We additionally test the
|
|
|
++ // tabs.onUpdated listener gets called with hidden state changes.
|
|
|
++ add_task(async function test_tabs_disable() {
|
|
|
++ await SpecialPowers.pushPrefEnv({
|
|
|
++@@ -134,10 +134,10 @@ add_task(async function test_tabs_disabl
|
|
|
++ Assert.ok(tab.hidden, "Tab is hidden by extension");
|
|
|
++
|
|
|
++ // Test that disable does hide tabs.
|
|
|
++ await disableExtension(ID);
|
|
|
++ Assert.ok(!tab.hidden, "Tab is not hidden hidden after disable");
|
|
|
++
|
|
|
++ await extension.unload();
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js b/browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js
|
|
|
+@@ -108,17 +108,17 @@ add_task(async function testExecuteScrip
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+
|
|
|
+ await extension.awaitFinish("insertCSS");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ // Make sure that we're not holding on to references to closed message
|
|
|
+ // managers.
|
|
|
+ is(getMessageManagersSize(MessageChannel.messageManagers), messageManagersSize,
|
|
|
+ "Message manager count");
|
|
|
+ is(MessageChannel.responseManagers.size, responseManagersSize, "Response manager count");
|
|
|
+ is(MessageChannel.pendingResponses.size, 0, "Pending response count");
|
|
|
+ });
|
|
|
+@@ -159,10 +159,10 @@ add_task(async function testInsertCSS_cl
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+ const unloadedStyles = await ContentTask.spawn(tab.linkedBrowser, null, getTabContentComputedStyle);
|
|
|
+
|
|
|
+ is(unloadedStyles[0], "rgba(0, 0, 0, 0)", "The injected CSS code has been removed as expected");
|
|
|
+ is(unloadedStyles[1], "rgb(0, 0, 0)", "The injected CSS file has been removed as expected");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_lazy.js b/browser/components/extensions/test/browser/browser_ext_tabs_lazy.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_lazy.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_lazy.js
|
|
|
+@@ -31,10 +31,10 @@ add_task(async function() {
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitFinish("lazy");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+ is(tab.getAttribute("pending"), "true", "The tab is still pending restore");
|
|
|
+ is(tab.linkedBrowser.isConnected, false, "The tab is still lazy");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_move_array.js b/browser/components/extensions/test/browser/browser_ext_tabs_move_array.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_move_array.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_move_array.js
|
|
|
+@@ -74,11 +74,11 @@ add_task(async function moveMultiple() {
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitFinish("tabs.move");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+ for (let tab of tabs) {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_move_window.js b/browser/components/extensions/test/browser/browser_ext_tabs_move_window.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_move_window.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_move_window.js
|
|
|
+@@ -32,17 +32,17 @@ add_task(async function() {
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitFinish("tabs.move.window");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+ for (let tab of window.gBrowser.tabs) {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ await BrowserTestUtils.closeWindow(window1);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_currentWindowAfterTabMoved() {
|
|
|
+ const files = {
|
|
|
+ "current.html": "<meta charset=utf-8><script src=current.js></script>",
|
|
|
+ "current.js": function() {
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_move_window_multiple.js b/browser/components/extensions/test/browser/browser_ext_tabs_move_window_multiple.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_move_window_multiple.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_move_window_multiple.js
|
|
|
+@@ -32,12 +32,12 @@ add_task(async function() {
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitFinish("tabs.move.multiple");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+ for (let tab of window.gBrowser.tabs) {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ await BrowserTestUtils.closeWindow(window1);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_move_window_pinned.js b/browser/components/extensions/test/browser/browser_ext_tabs_move_window_pinned.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_move_window_pinned.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_move_window_pinned.js
|
|
|
+@@ -31,12 +31,12 @@ add_task(async function() {
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitFinish("tabs.move.pin");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+ for (let tab of window.gBrowser.tabs) {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ await BrowserTestUtils.closeWindow(window1);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_opener.js b/browser/components/extensions/test/browser/browser_ext_tabs_opener.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_opener.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_opener.js
|
|
|
+@@ -68,11 +68,11 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+
|
|
|
+ await extension.awaitFinish("tab-opener");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_printPreview.js b/browser/components/extensions/test/browser/browser_ext_tabs_printPreview.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_printPreview.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_printPreview.js
|
|
|
+@@ -34,10 +34,10 @@ add_task(async function testPrintPreview
|
|
|
+ isnot(ppToolbar, null, "print preview toolbar created");
|
|
|
+
|
|
|
+ is(ppTab, gBrowser.selectedTab, "print preview tab selected");
|
|
|
+ is(ppTab.linkedBrowser.currentURI.spec, "about:printpreview", "print preview browser url correct");
|
|
|
+
|
|
|
+ PrintUtils.exitPrintPreview();
|
|
|
+ await BrowserTestUtils.waitForCondition(() => !window.gInPrintPreviewMode);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.tabs[1]);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.tabs[1]);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_query.js b/browser/components/extensions/test/browser/browser_ext_tabs_query.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_query.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_query.js
|
|
|
+@@ -44,18 +44,18 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitFinish("tabs.query");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+
|
|
|
+ tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://example.com/");
|
|
|
+ tab2 = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://example.net/");
|
|
|
+ let tab3 = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://test1.example.org/MochiKit/");
|
|
|
+
|
|
|
+ // test simple queries
|
|
|
+ extension = ExtensionTestUtils.loadExtension({
|
|
|
+ manifest: {
|
|
|
+@@ -165,19 +165,19 @@ add_task(async function() {
|
|
|
+ extension.sendMessage("check-size");
|
|
|
+ let dims = await extension.awaitMessage("dims");
|
|
|
+ is(dims.width, clientWidth, "tab reports expected width");
|
|
|
+ is(dims.height, clientHeight, "tab reports expected height");
|
|
|
+ }
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
+- await BrowserTestUtils.removeTab(tab3);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab3);
|
|
|
+ SpecialPowers.clearUserPref(RESOLUTION_PREF);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function testQueryPermissions() {
|
|
|
+ let extension = ExtensionTestUtils.loadExtension({
|
|
|
+ manifest: {
|
|
|
+ "permissions": [],
|
|
|
+ },
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_removeCSS.js b/browser/components/extensions/test/browser/browser_ext_tabs_removeCSS.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_removeCSS.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_removeCSS.js
|
|
|
+@@ -108,10 +108,10 @@ add_task(async function testExecuteScrip
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+
|
|
|
+ await extension.awaitFinish("removeCSS");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_saveAsPDF.js b/browser/components/extensions/test/browser/browser_ext_tabs_saveAsPDF.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_saveAsPDF.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_saveAsPDF.js
|
|
|
+@@ -74,17 +74,17 @@ async function testReturnStatus(expected
|
|
|
+ MockFilePicker.cleanup();
|
|
|
+
|
|
|
+ if (expectedStatus == "not_saved" || expectedStatus == "not_replaced") {
|
|
|
+ saveFile.permissions = 0o666;
|
|
|
+ }
|
|
|
+
|
|
|
+ saveDir.remove(true);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function testSaveAsPDF_saved() {
|
|
|
+ await testReturnStatus("saved");
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function testSaveAsPDF_replaced() {
|
|
|
+ await testReturnStatus("replaced");
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_sharingState.js.1442465-4_2.later b/browser/components/extensions/test/browser/browser_ext_tabs_sharingState.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_sharingState.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,14 @@
|
|
|
++--- browser_ext_tabs_sharingState.js
|
|
|
+++++ browser_ext_tabs_sharingState.js
|
|
|
++@@ -64,10 +64,10 @@ add_task(async function test_tabs_mediaI
|
|
|
++ // Test that onUpdated is called after the sharing state is changed from
|
|
|
++ // chrome code.
|
|
|
++ await extension.awaitMessage("ready");
|
|
|
++ gBrowser.setBrowserSharing(tab.linkedBrowser, {});
|
|
|
++
|
|
|
++ await extension.awaitFinish("done");
|
|
|
++ await extension.unload();
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_update.js b/browser/components/extensions/test/browser/browser_ext_tabs_update.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_update.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_update.js
|
|
|
+@@ -35,11 +35,11 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ await Promise.all([extension.startup(), extension.awaitMessage("check")]);
|
|
|
+
|
|
|
+ ok(gBrowser.selectedTab == tab2, "correct tab selected");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_update_url.js b/browser/components/extensions/test/browser/browser_ext_tabs_update_url.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_update_url.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_update_url.js
|
|
|
+@@ -58,17 +58,17 @@ async function testTabsUpdateURL(existen
|
|
|
+
|
|
|
+ info(`tab.update URL "${tabsUpdateURL}" on tab with URL "${existentTabURL}"`);
|
|
|
+
|
|
|
+ let tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, existentTabURL);
|
|
|
+
|
|
|
+ extension.sendMessage("start", tabsUpdateURL, isErrorExpected);
|
|
|
+ await extension.awaitMessage("done");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+ await extension.unload();
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ info("Start testing tabs.update on javascript URLs");
|
|
|
+
|
|
|
+ let dataURLPage = `data:text/html,
|
|
|
+ <!DOCTYPE html>
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_zoom.js b/browser/components/extensions/test/browser/browser_ext_tabs_zoom.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_tabs_zoom.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_tabs_zoom.js
|
|
|
+@@ -212,11 +212,11 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+
|
|
|
+ await extension.awaitFinish("tab-zoom");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js b/browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js
|
|
|
+@@ -37,11 +37,11 @@ add_task(async function test_sending_mes
|
|
|
+
|
|
|
+ // Simulate opening the newtab open as a user would.
|
|
|
+ BrowserOpenTab();
|
|
|
+
|
|
|
+ let url = await extension.awaitMessage("from-newtab-page");
|
|
|
+ ok(url.endsWith(NEWTAB_URI_1),
|
|
|
+ "Newtab url is overriden by the extension.");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js.1442465-4_2.later b/browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,158 @@
|
|
|
++--- browser_ext_url_overrides_newtab.js
|
|
|
+++++ browser_ext_url_overrides_newtab.js
|
|
|
++@@ -158,27 +158,27 @@ add_task(async function test_new_tab_ign
|
|
|
++
|
|
|
++ // Ensure panel is closed and the setting still isn't set.
|
|
|
++ ok(panel.getAttribute("panelopen") != "true",
|
|
|
++ "The notification panel is closed");
|
|
|
++ is(getNotificationSetting(extensionId), null,
|
|
|
++ "The New Tab notification is not set after ignoring the doorhanger");
|
|
|
++
|
|
|
++ // Close the first tab and open another new tab.
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ let newTabOpened = waitForNewTab();
|
|
|
++ BrowserOpenTab();
|
|
|
++ await newTabOpened;
|
|
|
++
|
|
|
++ // Verify the doorhanger is not shown a second time.
|
|
|
++ ok(panel.getAttribute("panelopen") != "true",
|
|
|
++ "The notification panel doesn't open after ignoring the doorhanger");
|
|
|
++ is(gURLBar.focused, true, "The URL bar is focused with no doorhanger");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ await extension.unload();
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function test_new_tab_keep_settings() {
|
|
|
++ await ExtensionSettingsStore.initialize();
|
|
|
++ let notification = getNewTabDoorhanger();
|
|
|
++ let panel = notification.closest("panel");
|
|
|
++ let extensionId = "newtabkeep@mochi.test";
|
|
|
++@@ -223,25 +223,25 @@ add_task(async function test_new_tab_kee
|
|
|
++
|
|
|
++ // Ensure panel is closed and setting is updated.
|
|
|
++ ok(panel.getAttribute("panelopen") != "true",
|
|
|
++ "The notification panel is closed after click");
|
|
|
++ is(getNotificationSetting(extensionId).value, true,
|
|
|
++ "The New Tab notification is set after keeping the changes");
|
|
|
++
|
|
|
++ // Close the first tab and open another new tab.
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserOpenTab();
|
|
|
++ await extension.awaitMessage("newtab");
|
|
|
++
|
|
|
++ // Verify the doorhanger is not shown a second time.
|
|
|
++ ok(panel.getAttribute("panelopen") != "true",
|
|
|
++ "The notification panel is not opened after keeping the changes");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++
|
|
|
++ let upgradedExtension = ExtensionTestUtils.loadExtension({
|
|
|
++ manifest: Object.assign({}, manifest, {version: "2.0"}),
|
|
|
++ files,
|
|
|
++ useAddonManager: "permanent",
|
|
|
++ });
|
|
|
++
|
|
|
++ await upgradedExtension.startup();
|
|
|
++@@ -250,17 +250,17 @@ add_task(async function test_new_tab_kee
|
|
|
++ await upgradedExtension.awaitMessage("newtab");
|
|
|
++
|
|
|
++ // Ensure panel is closed and setting is still set.
|
|
|
++ ok(panel.getAttribute("panelopen") != "true",
|
|
|
++ "The notification panel is closed after click");
|
|
|
++ is(getNotificationSetting(extensionId).value, true,
|
|
|
++ "The New Tab notification is set after keeping the changes");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ await upgradedExtension.unload();
|
|
|
++ await extension.unload();
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function test_new_tab_restore_settings() {
|
|
|
++ await ExtensionSettingsStore.initialize();
|
|
|
++ let notification = getNewTabDoorhanger();
|
|
|
++ let panel = notification.closest("panel");
|
|
|
++@@ -312,17 +312,17 @@ add_task(async function test_new_tab_res
|
|
|
++ "The user has been redirected to about:newtab");
|
|
|
++
|
|
|
++ // Wait for the next event tick to make sure the remaining part of the test
|
|
|
++ // is not executed inside tabbrowser's onLocationChange.
|
|
|
++ // See bug 1416153 for more details.
|
|
|
++ await TestUtils.waitForTick();
|
|
|
++
|
|
|
++ // Reopen a browser tab and verify that there's no doorhanger.
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ let newTabOpened = waitForNewTab();
|
|
|
++ BrowserOpenTab();
|
|
|
++ await newTabOpened;
|
|
|
++
|
|
|
++ ok(panel.getAttribute("panelopen") != "true",
|
|
|
++ "The notification panel is not opened after keeping the changes");
|
|
|
++
|
|
|
++ // FIXME: We need to enable the add-on so it gets cleared from the
|
|
|
++@@ -334,17 +334,17 @@ add_task(async function test_new_tab_res
|
|
|
++ AddonManager.removeAddonListener(listener);
|
|
|
++ resolve();
|
|
|
++ }
|
|
|
++ },
|
|
|
++ };
|
|
|
++ AddonManager.addAddonListener(listener);
|
|
|
++ });
|
|
|
++ addon.userDisabled = false;
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ await addonEnabled;
|
|
|
++ await extension.unload();
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function test_new_tab_restore_settings_multiple() {
|
|
|
++ await ExtensionSettingsStore.initialize();
|
|
|
++ let notification = getNewTabDoorhanger();
|
|
|
++ let panel = notification.closest("panel");
|
|
|
++@@ -437,25 +437,25 @@ add_task(async function test_new_tab_res
|
|
|
++ "The user is now on the original New Tab URL since all extensions are disabled");
|
|
|
++
|
|
|
++ // Wait for the next event tick to make sure the remaining part of the test
|
|
|
++ // is not executed inside tabbrowser's onLocationChange.
|
|
|
++ // See bug 1416153 for more details.
|
|
|
++ await TestUtils.waitForTick();
|
|
|
++
|
|
|
++ // Reopen a browser tab and verify that there's no doorhanger.
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ let newTabOpened = waitForNewTab();
|
|
|
++ BrowserOpenTab();
|
|
|
++ await newTabOpened;
|
|
|
++
|
|
|
++ ok(panel.getAttribute("panelopen") != "true",
|
|
|
++ "The notification panel is not opened after keeping the changes");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++
|
|
|
++ // FIXME: We need to enable the add-on so it gets cleared from the
|
|
|
++ // ExtensionSettingsStore for now. See bug 1408226.
|
|
|
++ let addonsEnabled = Promise.all([
|
|
|
++ waitForAddonEnabled(addonOne), waitForAddonEnabled(addonTwo)]);
|
|
|
++ addonOne.userDisabled = false;
|
|
|
++ addonTwo.userDisabled = false;
|
|
|
++ await addonsEnabled;
|
|
|
++@@ -504,11 +504,11 @@ add_task(async function dontTemporarilyS
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab({gBrowser, url});
|
|
|
++
|
|
|
++ gBrowser.removeProgressListener(wpl);
|
|
|
++ is(gURLBar.value, "", "URL bar value should be empty.");
|
|
|
++ ContentTask.spawn(tab.linkedBrowser, null, function() {
|
|
|
++ is(content.document.body.textContent, "New tab!", "New tab page is loaded.");
|
|
|
++ });
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ await extension.unload();
|
|
|
++ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_user_events.js b/browser/components/extensions/test/browser/browser_ext_user_events.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_user_events.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_user_events.js
|
|
|
+@@ -61,15 +61,15 @@ add_task(async function testSources() {
|
|
|
+ gBrowser.selectedTab = tab;
|
|
|
+
|
|
|
+ let menu = await openContextMenu("body");
|
|
|
+ let items = menu.getElementsByAttribute("label", "test user events");
|
|
|
+ is(items.length, 1, "Found context menu item");
|
|
|
+ EventUtils.synthesizeMouseAtCenter(items[0], {});
|
|
|
+ await check("context menu click");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+ registerCleanupFunction(() => CustomizableUI.reset());
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_webNavigation_frameId0.js b/browser/components/extensions/test/browser/browser_ext_webNavigation_frameId0.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_webNavigation_frameId0.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_webNavigation_frameId0.js
|
|
|
+@@ -23,10 +23,10 @@ add_task(async function webNavigation_ge
|
|
|
+
|
|
|
+ background: `(${background})(${JSON.stringify(DUMMY_URL)});`,
|
|
|
+ });
|
|
|
+
|
|
|
+ await extension.startup();
|
|
|
+ await extension.awaitFinish("frameId checked");
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget.js b/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget.js
|
|
|
+@@ -90,17 +90,17 @@ add_task(async function test_on_created_
|
|
|
+ },
|
|
|
+ expectedWebNavProps: {
|
|
|
+ sourceTabId: expectedSourceTab.sourceTabId,
|
|
|
+ sourceFrameId: 0,
|
|
|
+ url: `${OPENED_PAGE}#new-tab-from-targetblank-click`,
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_on_created_navigation_target_from_mouse_click_subframe() {
|
|
|
+ const tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, SOURCE_PAGE);
|
|
|
+
|
|
|
+ const extension = ExtensionTestUtils.loadExtension({
|
|
|
+@@ -166,12 +166,12 @@ add_task(async function test_on_created_
|
|
|
+ },
|
|
|
+ expectedWebNavProps: {
|
|
|
+ sourceTabId: expectedSourceTab.sourceTabId,
|
|
|
+ sourceFrameId: expectedSourceTab.sourceTabFrames[1].frameId,
|
|
|
+ url: `${OPENED_PAGE}#new-tab-from-targetblank-click-subframe`,
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_contextmenu.js b/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_contextmenu.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_contextmenu.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_contextmenu.js
|
|
|
+@@ -84,17 +84,17 @@ add_task(async function test_on_created_
|
|
|
+ },
|
|
|
+ expectedWebNavProps: {
|
|
|
+ sourceTabId: expectedSourceTab.sourceTabId,
|
|
|
+ sourceFrameId: 0,
|
|
|
+ url: `${OPENED_PAGE}#new-window-from-context-menu`,
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_on_created_navigation_target_from_context_menu_subframe() {
|
|
|
+ const tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, SOURCE_PAGE);
|
|
|
+
|
|
|
+ const extension = ExtensionTestUtils.loadExtension({
|
|
|
+@@ -147,12 +147,12 @@ add_task(async function test_on_created_
|
|
|
+ },
|
|
|
+ expectedWebNavProps: {
|
|
|
+ sourceTabId: expectedSourceTab.sourceTabId,
|
|
|
+ sourceFrameId: expectedSourceTab.sourceTabFrames[1].frameId,
|
|
|
+ url: `${OPENED_PAGE}#new-window-from-context-menu-subframe`,
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_named_window.js b/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_named_window.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_named_window.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_named_window.js
|
|
|
+@@ -86,12 +86,12 @@ add_task(async function test_window_open
|
|
|
+ sourceTabId: expectedSourceTab.sourceTabId,
|
|
|
+ sourceFrameId: 0,
|
|
|
+ url: `${OPENED_PAGE}#existent-named-window-open`,
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ assertNoPendingCreatedNavigationTargetData();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_subframe_window_open.js b/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_subframe_window_open.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_subframe_window_open.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_subframe_window_open.js
|
|
|
+@@ -86,17 +86,17 @@ add_task(async function test_window_open
|
|
|
+ sourceTabId: expectedSourceTab.sourceTabId,
|
|
|
+ sourceFrameId: expectedSourceTab.sourceTabFrames[1].frameId,
|
|
|
+ url: `${OPENED_PAGE}#new-win-from-window-open-subframe`,
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ assertNoPendingCreatedNavigationTargetData();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_window_open_close_from_browserAction_popup() {
|
|
|
+ const tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, SOURCE_PAGE);
|
|
|
+
|
|
|
+ gBrowser.selectedTab = tab1;
|
|
|
+@@ -152,12 +152,12 @@ add_task(async function test_window_open
|
|
|
+ sourceTabId: expectedSourceTab.sourceTabId,
|
|
|
+ sourceFrameId: 0,
|
|
|
+ url: `${OPENED_PAGE}#new-tab-from-window-open`,
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ assertNoPendingCreatedNavigationTargetData();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_window_open.js b/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_window_open.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_window_open.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_window_open.js
|
|
|
+@@ -86,17 +86,17 @@ add_task(async function test_window_open
|
|
|
+ sourceTabId: expectedSourceTab.sourceTabId,
|
|
|
+ sourceFrameId: 0,
|
|
|
+ url: `${OPENED_PAGE}#new-win-from-window-open`,
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ assertNoPendingCreatedNavigationTargetData();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_window_open_close_from_browserAction_popup() {
|
|
|
+ const tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, SOURCE_PAGE);
|
|
|
+
|
|
|
+ gBrowser.selectedTab = tab1;
|
|
|
+@@ -152,12 +152,12 @@ add_task(async function test_window_open
|
|
|
+ sourceTabId: expectedSourceTab.sourceTabId,
|
|
|
+ sourceFrameId: 0,
|
|
|
+ url: `${OPENED_PAGE}#new-tab-from-window-open`,
|
|
|
+ },
|
|
|
+ });
|
|
|
+
|
|
|
+ assertNoPendingCreatedNavigationTargetData();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_webRequest.js b/browser/components/extensions/test/browser/browser_ext_webRequest.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_webRequest.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_webRequest.js
|
|
|
+@@ -90,17 +90,17 @@ add_task(async function test_newTab() {
|
|
|
+ headers,
|
|
|
+ },
|
|
|
+ };
|
|
|
+ extension.sendMessage("set-expected", {expect, ignore: ["favicon.ico"]});
|
|
|
+ await extension.awaitMessage("continue");
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(window.gBrowser, dummy + "?newTab");
|
|
|
+
|
|
|
+ await extension.awaitMessage("done");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_subframe() {
|
|
|
+ let expect = {
|
|
|
+ "file_dummy.html": {
|
|
|
+ type: "main_frame",
|
|
|
+ headers,
|
|
|
+ },
|
|
|
+diff --git a/browser/components/extensions/test/browser/browser_ext_windows.js b/browser/components/extensions/test/browser/browser_ext_windows.js
|
|
|
+--- a/browser/components/extensions/test/browser/browser_ext_windows.js
|
|
|
++++ b/browser/components/extensions/test/browser/browser_ext_windows.js
|
|
|
+@@ -185,17 +185,17 @@ add_task(async function testWindowTitleP
|
|
|
+ await extension.awaitMessage("grant-activeTab");
|
|
|
+ await clickBrowserAction(extension);
|
|
|
+ extension.sendMessage("title", document.title);
|
|
|
+
|
|
|
+ await extension.awaitFinish("window-title-permissions");
|
|
|
+
|
|
|
+ await extension.unload();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function testInvalidWindowId() {
|
|
|
+ let extension = ExtensionTestUtils.loadExtension({
|
|
|
+ async background() {
|
|
|
+ await browser.test.assertRejects(
|
|
|
+ // Assuming that this windowId does not exist.
|
|
|
+ browser.windows.get(123456789),
|
|
|
+diff --git a/browser/components/feeds/test/browser/browser_telemetry_checks.js.1442465-4_2.later b/browser/components/feeds/test/browser/browser_telemetry_checks.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/feeds/test/browser/browser_telemetry_checks.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,15 @@
|
|
|
++--- browser_telemetry_checks.js
|
|
|
+++++ browser_telemetry_checks.js
|
|
|
++@@ -87,11 +87,11 @@ add_task(async function() {
|
|
|
++ Assert.equal(getSnapShot().parent[kLivemarkOpened], 1, "Should count livemark opening");
|
|
|
++
|
|
|
++ // And opening an item in the popup:
|
|
|
++ let item = await TestUtils.waitForCondition(
|
|
|
++ () => popup.querySelector("menuitem.bookmark-item"));
|
|
|
++ item.doCommand();
|
|
|
++ Assert.equal(getSnapShot().parent[kLivemarkItemOpened], 1, "Should count livemark item opening");
|
|
|
++ popup.hidePopup();
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
+diff --git a/browser/components/migration/tests/browser/browser_undo_notification.js b/browser/components/migration/tests/browser/browser_undo_notification.js
|
|
|
+--- a/browser/components/migration/tests/browser/browser_undo_notification.js
|
|
|
++++ b/browser/components/migration/tests/browser/browser_undo_notification.js
|
|
|
+@@ -21,17 +21,17 @@ add_task(async function autoMigrationUnd
|
|
|
+
|
|
|
+ // Disable preloaded activity-stream about:newtab for this test to only run on
|
|
|
+ // the tiles version
|
|
|
+ await SpecialPowers.pushPrefEnv({set: [
|
|
|
+ ["browser.newtabpage.activity-stream.enabled", false],
|
|
|
+ ["browser.newtab.preload", false]
|
|
|
+ ]});
|
|
|
+ // Open and close about:newtab to remove any preloaded activity-stream version
|
|
|
+- await BrowserTestUtils.removeTab(await BrowserTestUtils.openNewForegroundTab(gBrowser));
|
|
|
++ BrowserTestUtils.removeTab(await BrowserTestUtils.openNewForegroundTab(gBrowser));
|
|
|
+
|
|
|
+ for (let url of ["about:newtab", "about:home"]) {
|
|
|
+ undoCalled = false;
|
|
|
+ // Can't use pushPrefEnv because of bug 1323779
|
|
|
+ Services.prefs.setCharPref("browser.migrate.automigrate.browser", "someunknownbrowser");
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, url, false);
|
|
|
+ let browser = tab.linkedBrowser;
|
|
|
+ if (!getNotification(browser)) {
|
|
|
+@@ -40,17 +40,17 @@ add_task(async function autoMigrationUnd
|
|
|
+ }
|
|
|
+
|
|
|
+ ok(true, `Got notification for ${url}`);
|
|
|
+ let notification = getNotification(browser);
|
|
|
+ let notificationBox = notification.parentNode;
|
|
|
+ notification.querySelector("button.notification-button-default").click();
|
|
|
+ ok(!undoCalled, "Undo should not be called when clicking the default button");
|
|
|
+ is(notification, notificationBox._closedNotification, "Notification should be closing");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ undoCalled = false;
|
|
|
+ Services.prefs.setCharPref("browser.migrate.automigrate.browser", "chrome");
|
|
|
+ tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, url, false);
|
|
|
+ browser = tab.linkedBrowser;
|
|
|
+ if (!getNotification(browser)) {
|
|
|
+ info(`Notification for ${url} not immediately present, waiting for it.`);
|
|
|
+ await BrowserTestUtils.waitForNotificationBar(gBrowser, browser, kExpectedNotificationId);
|
|
|
+@@ -65,13 +65,13 @@ add_task(async function autoMigrationUnd
|
|
|
+ ["browser.migrate.automigrate.undo-survey-locales", "en-US"],
|
|
|
+ ]});
|
|
|
+ let tabOpenedPromise = BrowserTestUtils.waitForNewTab(gBrowser, "https://example.com/?browser=Google%20Chrome");
|
|
|
+ notification.querySelector("button:not(.notification-button-default)").click();
|
|
|
+ ok(undoCalled, "Undo should be called when clicking the non-default (Don't Keep) button");
|
|
|
+ is(notification, notificationBox._closedNotification, "Notification should be closing");
|
|
|
+ let surveyTab = await tabOpenedPromise;
|
|
|
+ ok(surveyTab, "Should have opened a tab with a survey");
|
|
|
+- await BrowserTestUtils.removeTab(surveyTab);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(surveyTab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/components/migration/tests/browser/browser_undo_notification_multiple_dismissal.js b/browser/components/migration/tests/browser/browser_undo_notification_multiple_dismissal.js
|
|
|
+--- a/browser/components/migration/tests/browser/browser_undo_notification_multiple_dismissal.js
|
|
|
++++ b/browser/components/migration/tests/browser/browser_undo_notification_multiple_dismissal.js
|
|
|
+@@ -112,11 +112,11 @@ add_task(async function checkNotificatio
|
|
|
+ info("Waiting for notification to be removed in first (background) tab");
|
|
|
+ await firstTabNotificationRemovedPromise;
|
|
|
+ info("Waiting for bookmark to be removed");
|
|
|
+ await bookmarkRemovedPromise;
|
|
|
+ info("Waiting for prefs to be reset");
|
|
|
+ await prefResetPromise;
|
|
|
+
|
|
|
+ info("Removing spare tabs");
|
|
|
+- await BrowserTestUtils.removeTab(firstTab);
|
|
|
+- await BrowserTestUtils.removeTab(secondTab);
|
|
|
++ BrowserTestUtils.removeTab(firstTab);
|
|
|
++ BrowserTestUtils.removeTab(secondTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/migration/tests/browser/browser_undo_notification_wording.js b/browser/components/migration/tests/browser/browser_undo_notification_wording.js
|
|
|
+--- a/browser/components/migration/tests/browser/browser_undo_notification_wording.js
|
|
|
++++ b/browser/components/migration/tests/browser/browser_undo_notification_wording.js
|
|
|
+@@ -56,12 +56,12 @@ add_task(async function autoMigrationUnd
|
|
|
+ ok(notificationText.includes(localizedImportItem),
|
|
|
+ "Expected notification to contain " + localizedImportItem);
|
|
|
+ } else {
|
|
|
+ ok(!notificationText.includes(localizedImportItem),
|
|
|
+ "Expected notification not to contain " + localizedImportItem);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/components/newtab/tests/browser/browser_newtab_overrides.js b/browser/components/newtab/tests/browser/browser_newtab_overrides.js
|
|
|
+--- a/browser/components/newtab/tests/browser/browser_newtab_overrides.js
|
|
|
++++ b/browser/components/newtab/tests/browser/browser_newtab_overrides.js
|
|
|
+@@ -78,17 +78,17 @@ add_task(async function override_loads_i
|
|
|
+
|
|
|
+ let browser = gBrowser.selectedBrowser;
|
|
|
+ await BrowserTestUtils.browserLoaded(browser);
|
|
|
+
|
|
|
+ await ContentTask.spawn(browser, {url: overrideURL}, async function(args) {
|
|
|
+ Assert.equal(content.location.href, args.url.trim(), "Got right URL");
|
|
|
+ Assert.equal(content.document.location.href, args.url.trim(), "Got right URL");
|
|
|
+ }); // jshint ignore:line
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Tests edge cases when someone overrides the newtabpage with whitespace
|
|
|
+ */
|
|
|
+ add_task(async function override_blank_loads_in_browser() {
|
|
|
+ let overrides = [
|
|
|
+@@ -110,17 +110,17 @@ add_task(async function override_blank_l
|
|
|
+
|
|
|
+ let browser = gBrowser.selectedBrowser;
|
|
|
+ await BrowserTestUtils.browserLoaded(browser);
|
|
|
+
|
|
|
+ await ContentTask.spawn(browser, {}, async function() {
|
|
|
+ Assert.equal(content.location.href, "about:blank", "Got right URL");
|
|
|
+ Assert.equal(content.document.location.href, "about:blank", "Got right URL");
|
|
|
+ }); // jshint ignore:line
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ function nextChangeNotificationPromise(aNewURL, testMessage) {
|
|
|
+ return TestUtils.topicObserved("newtab-url-changed", function observer(aSubject, aData) { // jshint unused:false
|
|
|
+ Assert.equal(aData, aNewURL, testMessage);
|
|
|
+ return true;
|
|
|
+ });
|
|
|
+diff --git a/browser/components/originattributes/test/browser/browser_favicon_firstParty.js b/browser/components/originattributes/test/browser/browser_favicon_firstParty.js
|
|
|
+--- a/browser/components/originattributes/test/browser/browser_favicon_firstParty.js
|
|
|
++++ b/browser/components/originattributes/test/browser/browser_favicon_firstParty.js
|
|
|
+@@ -177,17 +177,17 @@ async function assignCookiesUnderFirstPa
|
|
|
+ // iframe which loads the aURL.
|
|
|
+ let tabInfo = await openTabInFirstParty(aURL, aFirstParty);
|
|
|
+
|
|
|
+ // Add cookies into the iframe.
|
|
|
+ await ContentTask.spawn(tabInfo.browser, aCookieValue, async function(value) {
|
|
|
+ content.document.cookie = value;
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tabInfo.tab);
|
|
|
++ BrowserTestUtils.removeTab(tabInfo.tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ async function generateCookies(aThirdParty) {
|
|
|
+ // we generate two different cookies for two first party domains.
|
|
|
+ let cookies = [];
|
|
|
+ cookies.push(Math.random().toString());
|
|
|
+ cookies.push(Math.random().toString());
|
|
|
+
|
|
|
+@@ -236,17 +236,17 @@ async function doTest(aTestPage, aExpect
|
|
|
+ promiseObserveFavicon = observeFavicon(FIRST_PARTY_TWO, aExpectedCookies[1], secondPageURI);
|
|
|
+
|
|
|
+ // Open the tab for the second site.
|
|
|
+ tabInfo = await openTab(TEST_SITE_TWO + aTestPage);
|
|
|
+
|
|
|
+ // Waiting until favicon requests are all made.
|
|
|
+ await promiseObserveFavicon;
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tabInfo.tab);
|
|
|
++ BrowserTestUtils.removeTab(tabInfo.tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function setup() {
|
|
|
+ // Make sure first party isolation is enabled.
|
|
|
+ await SpecialPowers.pushPrefEnv({"set": [
|
|
|
+ ["privacy.firstparty.isolate", true]
|
|
|
+ ]});
|
|
|
+ });
|
|
|
+@@ -324,12 +324,12 @@ add_task(async function test_favicon_cac
|
|
|
+ // go through the network.
|
|
|
+ response = await promiseForFaviconResponse;
|
|
|
+
|
|
|
+ // Check that the favicon response has came from the network and it has the
|
|
|
+ // correct first party domain.
|
|
|
+ is(response.topic, "http-on-examine-response", "The favicon image should be loaded through network again.");
|
|
|
+ is(response.firstPartyDomain, FIRST_PARTY_TWO, "We should only observe the network response for the second first party.");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tabInfoA.tab);
|
|
|
+- await BrowserTestUtils.removeTab(tabInfoB.tab);
|
|
|
+- await BrowserTestUtils.removeTab(tabInfoC.tab);
|
|
|
++ BrowserTestUtils.removeTab(tabInfoA.tab);
|
|
|
++ BrowserTestUtils.removeTab(tabInfoB.tab);
|
|
|
++ BrowserTestUtils.removeTab(tabInfoC.tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/originattributes/test/browser/browser_favicon_firstParty.js.1442465-4_2.later b/browser/components/originattributes/test/browser/browser_favicon_firstParty.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/originattributes/test/browser/browser_favicon_firstParty.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,40 @@
|
|
|
++--- browser_favicon_firstParty.js
|
|
|
+++++ browser_favicon_firstParty.js
|
|
|
++@@ -284,17 +284,17 @@ async function doTestForAllTabsFavicon(a
|
|
|
++ await allTabsPopupShownPromise;
|
|
|
++
|
|
|
++ // Close the popup of allTabs and wait until it's done.
|
|
|
++ let allTabsPopupHiddenPromise = BrowserTestUtils.waitForEvent(allTabsBtn, "popuphidden");
|
|
|
++ EventUtils.synthesizeMouseAtCenter(allTabsBtn, {});
|
|
|
++ await allTabsPopupHiddenPromise;
|
|
|
++
|
|
|
++ // Close the tab.
|
|
|
++- await BrowserTestUtils.removeTab(tabInfo.tab);
|
|
|
+++ BrowserTestUtils.removeTab(tabInfo.tab);
|
|
|
++
|
|
|
++ faviconURI = aIsThirdParty ? THIRD_PARTY_SITE + FAVICON_URI :
|
|
|
++ TEST_SITE_TWO + FAVICON_URI;
|
|
|
++
|
|
|
++ // Start to observe the event of that favicon has been fully loaded.
|
|
|
++ promiseFaviconLoaded = waitOnFaviconLoaded(faviconURI);
|
|
|
++
|
|
|
++ // Open the tab for the second site.
|
|
|
++@@ -317,17 +317,17 @@ async function doTestForAllTabsFavicon(a
|
|
|
++ await allTabsPopupShownPromise;
|
|
|
++
|
|
|
++ // Close the popup of allTabs and wait until it's done.
|
|
|
++ allTabsPopupHiddenPromise = BrowserTestUtils.waitForEvent(allTabsBtn, "popuphidden");
|
|
|
++ EventUtils.synthesizeMouseAtCenter(allTabsBtn, {});
|
|
|
++ await allTabsPopupHiddenPromise;
|
|
|
++
|
|
|
++ // Close the tab.
|
|
|
++- await BrowserTestUtils.removeTab(tabInfo.tab);
|
|
|
+++ BrowserTestUtils.removeTab(tabInfo.tab);
|
|
|
++
|
|
|
++ // Reset the 'overflow' attribute to make the allTabs button hidden again.
|
|
|
++ tabBrowser.removeAttribute("overflow");
|
|
|
++ }
|
|
|
++
|
|
|
++ add_task(async function setup() {
|
|
|
++ // Make sure first party isolation is enabled.
|
|
|
++ await SpecialPowers.pushPrefEnv({"set": [
|
|
|
+diff --git a/browser/components/originattributes/test/browser/browser_windowOpenerRestriction.js b/browser/components/originattributes/test/browser/browser_windowOpenerRestriction.js
|
|
|
+--- a/browser/components/originattributes/test/browser/browser_windowOpenerRestriction.js
|
|
|
++++ b/browser/components/originattributes/test/browser/browser_windowOpenerRestriction.js
|
|
|
+@@ -53,17 +53,17 @@ async function testPref(aIsPrefEnabled)
|
|
|
+
|
|
|
+ // The target page will do the check and show the result through its title.
|
|
|
+ is(targetBrowser.contentTitle, "pass", "The behavior of window.opener is correct.");
|
|
|
+
|
|
|
+ // Close Tabs.
|
|
|
+ await ContentTask.spawn(browser, null, async function() {
|
|
|
+ this.openedWindow.close();
|
|
|
+ });
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ // Reset cookies
|
|
|
+ Services.cookies.removeAll();
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function runTests() {
|
|
|
+ let tests = [true, false];
|
|
|
+
|
|
|
+diff --git a/browser/components/originattributes/test/browser/head.js b/browser/components/originattributes/test/browser/head.js
|
|
|
+--- a/browser/components/originattributes/test/browser/head.js
|
|
|
++++ b/browser/components/originattributes/test/browser/head.js
|
|
|
+@@ -357,14 +357,14 @@ this.IsolationTestTools = {
|
|
|
+ `isolation ${shouldIsolate ? "on" : "off"} with TabSettingA ` +
|
|
|
+ `${tabSettingA} and tabSettingB ${tabSettingB}` +
|
|
|
+ `, resultA = ${resultA}, resultB = ${resultB}`;
|
|
|
+
|
|
|
+ ok(result, msg);
|
|
|
+ }
|
|
|
+
|
|
|
+ // Close Tabs.
|
|
|
+- await BrowserTestUtils.removeTab(tabInfoA.tab);
|
|
|
+- await BrowserTestUtils.removeTab(tabInfoB.tab);
|
|
|
++ BrowserTestUtils.removeTab(tabInfoA.tab);
|
|
|
++ BrowserTestUtils.removeTab(tabInfoB.tab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ };
|
|
|
+diff --git a/browser/components/places/tests/browser/browser_addBookmarkForFrame.js b/browser/components/places/tests/browser/browser_addBookmarkForFrame.js
|
|
|
+--- a/browser/components/places/tests/browser/browser_addBookmarkForFrame.js
|
|
|
++++ b/browser/components/places/tests/browser/browser_addBookmarkForFrame.js
|
|
|
+@@ -21,17 +21,17 @@ async function withAddBookmarkForFrame(t
|
|
|
+ await withBookmarksDialog(true, function() {
|
|
|
+ let frameMenuItem = document.getElementById("frame");
|
|
|
+ frameMenuItem.click();
|
|
|
+
|
|
|
+ let bookmarkFrame = document.getElementById("context-bookmarkframe");
|
|
|
+ bookmarkFrame.click();
|
|
|
+ }, taskFn);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function test_open_add_bookmark_for_frame() {
|
|
|
+ info("Test basic opening of the add bookmark for frame dialog.");
|
|
|
+ await withAddBookmarkForFrame(async dialogWin => {
|
|
|
+ let namepicker = dialogWin.document.getElementById("editBMPanel_namePicker");
|
|
|
+ Assert.ok(!namepicker.readOnly, "Name field is writable");
|
|
|
+ Assert.equal(namepicker.value, "Left frame", "Name field is correct.");
|
|
|
+diff --git a/browser/components/places/tests/browser/browser_bookmarkProperties_bookmarkAllTabs.js b/browser/components/places/tests/browser/browser_bookmarkProperties_bookmarkAllTabs.js
|
|
|
+--- a/browser/components/places/tests/browser/browser_bookmarkProperties_bookmarkAllTabs.js
|
|
|
++++ b/browser/components/places/tests/browser/browser_bookmarkProperties_bookmarkAllTabs.js
|
|
|
+@@ -7,17 +7,17 @@ const TEST_URLS = [
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ let tabs = [];
|
|
|
+ for (let url of TEST_URLS) {
|
|
|
+ tabs.push(await BrowserTestUtils.openNewForegroundTab(gBrowser, url));
|
|
|
+ }
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+ for (let tab of tabs) {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ await withBookmarksDialog(true,
|
|
|
+ function open() {
|
|
|
+ document.getElementById("Browser:BookmarkAllTabs").doCommand();
|
|
|
+ },
|
|
|
+ async dialog => {
|
|
|
+diff --git a/browser/components/places/tests/browser/browser_bookmarkProperties_no_user_actions.js.1442465-4_2.later b/browser/components/places/tests/browser/browser_bookmarkProperties_no_user_actions.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/places/tests/browser/browser_bookmarkProperties_no_user_actions.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_bookmarkProperties_no_user_actions.js
|
|
|
+++++ browser_bookmarkProperties_no_user_actions.js
|
|
|
++@@ -15,17 +15,17 @@ add_task(async function test_change_titl
|
|
|
++
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab({
|
|
|
++ gBrowser,
|
|
|
++ opening: TEST_URL,
|
|
|
++ waitForStateStop: true
|
|
|
++ });
|
|
|
++
|
|
|
++ registerCleanupFunction(async () => {
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ await PlacesUtils.bookmarks.eraseEverything();
|
|
|
++ });
|
|
|
++
|
|
|
++ let bookmarkPanel = document.getElementById("editBookmarkPanel");
|
|
|
++ let shownPromise = promisePopupShown(bookmarkPanel);
|
|
|
++
|
|
|
++ let bookmarkStar = BookmarkingUI.star;
|
|
|
++ bookmarkStar.click();
|
|
|
+diff --git a/browser/components/places/tests/browser/browser_bookmark_add_tags.js.1442465-4_2.later b/browser/components/places/tests/browser/browser_bookmark_add_tags.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/places/tests/browser/browser_bookmark_add_tags.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_bookmark_add_tags.js
|
|
|
+++++ browser_bookmark_add_tags.js
|
|
|
++@@ -29,17 +29,17 @@ add_task(async function test_add_bookmar
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab({
|
|
|
++ gBrowser,
|
|
|
++ opening: TEST_URL,
|
|
|
++ waitForStateStop: true
|
|
|
++ });
|
|
|
++
|
|
|
++ // Cleanup.
|
|
|
++ registerCleanupFunction(async function() {
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ let bookmarkPanelTitle = document.getElementById("editBookmarkPanelTitle");
|
|
|
++
|
|
|
++ // The bookmarks panel is expected to auto-close after this step.
|
|
|
++ await hideBookmarksPanel(async () => {
|
|
|
++ // Click the bookmark star to bookmark the page.
|
|
|
++ await clickBookmarkStar();
|
|
|
+diff --git a/browser/components/places/tests/browser/browser_bookmark_all_tabs.js b/browser/components/places/tests/browser/browser_bookmark_all_tabs.js
|
|
|
+--- a/browser/components/places/tests/browser/browser_bookmark_all_tabs.js
|
|
|
++++ b/browser/components/places/tests/browser/browser_bookmark_all_tabs.js
|
|
|
+@@ -27,11 +27,13 @@ add_task(async function() {
|
|
|
+ BASE_URL + "bookmark_dummy_2.html"
|
|
|
+ ], "Correct URIs are returned");
|
|
|
+
|
|
|
+ Assert.deepEqual(URIs.map(URI => URI.title), [
|
|
|
+ "New Tab", "Bookmark Dummy 1", "Bookmark Dummy 2"
|
|
|
+ ], "Correct titles are returned");
|
|
|
+
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await Promise.all(tabs.map(BrowserTestUtils.removeTab));
|
|
|
++ for (let tab of tabs) {
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
++ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/browser/components/places/tests/browser/browser_bookmark_private_window.js.1442465-4_2.later b/browser/components/places/tests/browser/browser_bookmark_private_window.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/places/tests/browser/browser_bookmark_private_window.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_bookmark_private_window.js
|
|
|
+++++ browser_bookmark_private_window.js
|
|
|
++@@ -14,17 +14,17 @@ registerCleanupFunction(async () => {
|
|
|
++ await PlacesUtils.bookmarks.eraseEverything();
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function test_add_bookmark_from_private_window() {
|
|
|
++ let win = await BrowserTestUtils.openNewBrowserWindow({private: true});
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(win.gBrowser, TEST_URL);
|
|
|
++
|
|
|
++ registerCleanupFunction(async () => {
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ await BrowserTestUtils.closeWindow(win);
|
|
|
++ });
|
|
|
++
|
|
|
++ // Open the bookmark panel.
|
|
|
++ let bookmarkPanel = win.document.getElementById("editBookmarkPanel");
|
|
|
++ let shownPromise = promisePopupShown(bookmarkPanel);
|
|
|
++ let bookmarkStar = win.BookmarkingUI.star;
|
|
|
++ bookmarkStar.click();
|
|
|
+diff --git a/browser/components/places/tests/browser/browser_bookmark_remove_tags.js.1442465-4_2.later b/browser/components/places/tests/browser/browser_bookmark_remove_tags.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/places/tests/browser/browser_bookmark_remove_tags.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_bookmark_remove_tags.js
|
|
|
+++++ browser_bookmark_remove_tags.js
|
|
|
++@@ -36,17 +36,17 @@ add_task(async function test_remove_tags
|
|
|
++
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab({
|
|
|
++ gBrowser,
|
|
|
++ opening: TEST_URL,
|
|
|
++ waitForStateStop: true
|
|
|
++ });
|
|
|
++
|
|
|
++ registerCleanupFunction(async () => {
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ let bookmarkPanel = document.getElementById("editBookmarkPanel");
|
|
|
++ let shownPromise = promisePopupShown(bookmarkPanel);
|
|
|
++ let bookmarkStar = BookmarkingUI.star;
|
|
|
++ bookmarkStar.click();
|
|
|
++ await shownPromise;
|
|
|
++
|
|
|
+diff --git a/browser/components/places/tests/browser/browser_bookmarklet_windowOpen.js b/browser/components/places/tests/browser/browser_bookmarklet_windowOpen.js
|
|
|
+--- a/browser/components/places/tests/browser/browser_bookmarklet_windowOpen.js
|
|
|
++++ b/browser/components/places/tests/browser/browser_bookmarklet_windowOpen.js
|
|
|
+@@ -50,11 +50,11 @@ add_task(async function openKeywordBookm
|
|
|
+ info("Got tab");
|
|
|
+ let browser = tab.linkedBrowser;
|
|
|
+ if (!browser.currentURI || browser.currentURI.spec != TEST_URL) {
|
|
|
+ info("Waiting for browser load");
|
|
|
+ await BrowserTestUtils.browserLoaded(browser, false, TEST_URL);
|
|
|
+ }
|
|
|
+ is(browser.currentURI && browser.currentURI.spec, TEST_URL, "Tab with expected URL loaded.");
|
|
|
+ info("Waiting to remove tab");
|
|
|
+- await Promise.all([ BrowserTestUtils.removeTab(tab),
|
|
|
+- BrowserTestUtils.removeTab(moztab) ]);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(moztab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/places/tests/browser/browser_bookmarks_change_title.js.1442465-4_2.later b/browser/components/places/tests/browser/browser_bookmarks_change_title.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/places/tests/browser/browser_bookmarks_change_title.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_bookmarks_change_title.js
|
|
|
+++++ browser_bookmarks_change_title.js
|
|
|
++@@ -44,17 +44,17 @@ add_task(async function test_change_titl
|
|
|
++
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab({
|
|
|
++ gBrowser,
|
|
|
++ opening: TEST_URL,
|
|
|
++ waitForStateStop: true
|
|
|
++ });
|
|
|
++
|
|
|
++ registerCleanupFunction(async () => {
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ let bookmarkPanel = document.getElementById("editBookmarkPanel");
|
|
|
++ let shownPromise = promisePopupShown(bookmarkPanel);
|
|
|
++
|
|
|
++ let bookmarkStar = BookmarkingUI.star;
|
|
|
++ bookmarkStar.click();
|
|
|
++
|
|
|
+diff --git a/browser/components/places/tests/browser/browser_click_bookmarks_on_toolbar.js b/browser/components/places/tests/browser/browser_click_bookmarks_on_toolbar.js
|
|
|
+--- a/browser/components/places/tests/browser/browser_click_bookmarks_on_toolbar.js
|
|
|
++++ b/browser/components/places/tests/browser/browser_click_bookmarks_on_toolbar.js
|
|
|
+@@ -28,17 +28,17 @@ function waitForNewTab(url, inBackground
|
|
|
+ if (inBackground) {
|
|
|
+ Assert.notEqual(tab,
|
|
|
+ gBrowser.selectedTab, `The new tab is in the background`);
|
|
|
+ } else {
|
|
|
+ Assert.equal(tab,
|
|
|
+ gBrowser.selectedTab, `The new tab is in the foreground`);
|
|
|
+ }
|
|
|
+
|
|
|
+- return BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function setup() {
|
|
|
+ let bookmarks = await Promise.all(TEST_PAGES.map((url, index) => {
|
|
|
+ return PlacesUtils.bookmarks.insert({
|
|
|
+ parentGuid: PlacesUtils.bookmarks.toolbarGuid,
|
|
|
+ title: `Title ${index}`,
|
|
|
+@@ -152,12 +152,12 @@ add_task(async function quickContextMenu
|
|
|
+ await promise;
|
|
|
+
|
|
|
+ Assert.ok(!document.getElementById("placesContext_open").disabled,
|
|
|
+ "Commands in context menu are enabled");
|
|
|
+
|
|
|
+ promise = BrowserTestUtils.waitForEvent(placesContext, "popuphidden");
|
|
|
+ placesContext.hidePopup();
|
|
|
+ await promise;
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+
|
|
|
+ await SpecialPowers.popPrefEnv();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/places/tests/browser/browser_library_left_pane_middleclick.js b/browser/components/places/tests/browser/browser_library_left_pane_middleclick.js
|
|
|
+--- a/browser/components/places/tests/browser/browser_library_left_pane_middleclick.js
|
|
|
++++ b/browser/components/places/tests/browser/browser_library_left_pane_middleclick.js
|
|
|
+@@ -70,17 +70,19 @@ add_task(async function test_open_folder
|
|
|
+ gLibrary.PlacesOrganizer._places.view.treeIndexForNode(bookmarkedNode),
|
|
|
+ 0,
|
|
|
+ { button: 1 });
|
|
|
+
|
|
|
+ let tabs = await promiseLoaded;
|
|
|
+
|
|
|
+ Assert.ok(true, "Expected tabs were loaded");
|
|
|
+
|
|
|
+- await Promise.all(tabs.map(tab => BrowserTestUtils.removeTab(tab)));
|
|
|
++ for (let tab of tabs) {
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
++ }
|
|
|
+ });
|
|
|
+
|
|
|
+ function mouseEventOnCell(aTree, aRowIndex, aColumnIndex, aEventDetails) {
|
|
|
+ var selection = aTree.view.selection;
|
|
|
+ selection.select(aRowIndex);
|
|
|
+ aTree.treeBoxObject.ensureRowIsVisible(aRowIndex);
|
|
|
+ var column = aTree.columns[aColumnIndex];
|
|
|
+
|
|
|
+diff --git a/browser/components/places/tests/browser/browser_library_middleclick.js b/browser/components/places/tests/browser/browser_library_middleclick.js
|
|
|
+--- a/browser/components/places/tests/browser/browser_library_middleclick.js
|
|
|
++++ b/browser/components/places/tests/browser/browser_library_middleclick.js
|
|
|
+@@ -181,17 +181,19 @@ async function runTest(test) {
|
|
|
+ BrowserTestUtils.waitForNewTab(gBrowser, uri, false, true)));
|
|
|
+
|
|
|
+ mouseEventOnCell(gLibrary.ContentTree.view, 0, 0, { button: 1 });
|
|
|
+
|
|
|
+ let tabs = await promiseLoaded;
|
|
|
+
|
|
|
+ Assert.ok(true, "Expected tabs were loaded");
|
|
|
+
|
|
|
+- await Promise.all(tabs.map(tab => BrowserTestUtils.removeTab(tab)));
|
|
|
++ for (let tab of tabs) {
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
++ }
|
|
|
+
|
|
|
+ await test.cleanup();
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function test_all() {
|
|
|
+ for (let test of gTests) {
|
|
|
+ await runTest(test);
|
|
|
+ }
|
|
|
+diff --git a/browser/components/places/tests/browser/browser_markPageAsFollowedLink.js b/browser/components/places/tests/browser/browser_markPageAsFollowedLink.js
|
|
|
+--- a/browser/components/places/tests/browser/browser_markPageAsFollowedLink.js
|
|
|
++++ b/browser/components/places/tests/browser/browser_markPageAsFollowedLink.js
|
|
|
+@@ -42,17 +42,17 @@ add_task(async function test() {
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, {}, async function() {
|
|
|
+ content.frames[0].document.getElementById("clickme").click();
|
|
|
+ });
|
|
|
+
|
|
|
+ // Wait for the right frame visit to be registered.
|
|
|
+ info("Waiting right frame visit");
|
|
|
+ await deferredRightFrameVisit.promise;
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ function getTransitionForUrl(url) {
|
|
|
+ return PlacesUtils.withConnectionWrapper("browser_markPageAsFollowedLink", async db => {
|
|
|
+ let rows = await db.execute(`
|
|
|
+ SELECT visit_type
|
|
|
+ FROM moz_historyvisits
|
|
|
+ JOIN moz_places h ON place_id = h.id
|
|
|
+diff --git a/browser/components/places/tests/browser/browser_stayopenmenu.js.1442465-4_2.later b/browser/components/places/tests/browser/browser_stayopenmenu.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/places/tests/browser/browser_stayopenmenu.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,139 @@
|
|
|
++--- browser_stayopenmenu.js
|
|
|
+++++ browser_stayopenmenu.js
|
|
|
++@@ -6,17 +6,17 @@
|
|
|
++
|
|
|
++ async function locateBookmarkAndTestCtrlClick(menupopup) {
|
|
|
++ let testMenuitem = [...menupopup.childNodes].find(node => node.label == "Test1");
|
|
|
++ ok(testMenuitem, "Found test bookmark.");
|
|
|
++ let promiseTabOpened = BrowserTestUtils.waitForNewTab(gBrowser, null);
|
|
|
++ EventUtils.synthesizeMouseAtCenter(testMenuitem, {accelKey: true});
|
|
|
++ let newTab = await promiseTabOpened;
|
|
|
++ ok(true, "Bookmark ctrl-click opened new tab.");
|
|
|
++- await BrowserTestUtils.removeTab(newTab);
|
|
|
+++ BrowserTestUtils.removeTab(newTab);
|
|
|
++ return testMenuitem;
|
|
|
++ }
|
|
|
++
|
|
|
++ async function testContextmenu(menuitem) {
|
|
|
++ let doc = menuitem.ownerDocument;
|
|
|
++ let cm = doc.getElementById("placesContext");
|
|
|
++ let promiseEvent = BrowserTestUtils.waitForEvent(cm, "popupshown");
|
|
|
++ EventUtils.synthesizeMouseAtCenter(menuitem, {type: "contextmenu", button: 2});
|
|
|
++@@ -98,28 +98,28 @@ add_task(async function testStayopenBook
|
|
|
++ var menuitem = await locateBookmarkAndTestCtrlClick(BMBpopup);
|
|
|
++ ok(BMB.open, "Bookmarks Menu Button's Popup should still be open.");
|
|
|
++
|
|
|
++ // Test Bookmarks Menu Button stayopen clicks: middle-click.
|
|
|
++ let promiseTabOpened = BrowserTestUtils.waitForNewTab(gBrowser, null);
|
|
|
++ EventUtils.synthesizeMouseAtCenter(menuitem, {button: 1});
|
|
|
++ let newTab = await promiseTabOpened;
|
|
|
++ ok(true, "Bookmark middle-click opened new tab.");
|
|
|
++- await BrowserTestUtils.removeTab(newTab);
|
|
|
+++ BrowserTestUtils.removeTab(newTab);
|
|
|
++ ok(BMB.open, "Bookmarks Menu Button's Popup should still be open.");
|
|
|
++
|
|
|
++ // Test Bookmarks Menu Button stayopen clicks - 'Open in new tab' on context menu.
|
|
|
++ newTab = await testContextmenu(menuitem);
|
|
|
++ ok(true, "Bookmark contextmenu opened new tab.");
|
|
|
++ ok(BMB.open, "Bookmarks Menu Button's Popup should still be open.");
|
|
|
++ promiseEvent = BrowserTestUtils.waitForEvent(BMBpopup, "popuphidden");
|
|
|
++ BMB.open = false;
|
|
|
++ await promiseEvent;
|
|
|
++ info("Closing menu");
|
|
|
++- await BrowserTestUtils.removeTab(newTab);
|
|
|
+++ BrowserTestUtils.removeTab(newTab);
|
|
|
++
|
|
|
++ // Test App Menu's Bookmarks Library stayopen clicks.
|
|
|
++ let appMenu = document.getElementById("PanelUI-menu-button");
|
|
|
++ let appMenuPopup = document.getElementById("appMenu-popup");
|
|
|
++ let PopupShownPromise = BrowserTestUtils.waitForEvent(appMenuPopup, "popupshown");
|
|
|
++ appMenu.click();
|
|
|
++ await PopupShownPromise;
|
|
|
++ let libView = document.getElementById("appMenu-libraryView");
|
|
|
++@@ -140,17 +140,17 @@ add_task(async function testStayopenBook
|
|
|
++ var testMenuitem = await locateBookmarkAndTestCtrlClick(menu);
|
|
|
++ ok(appMenu.open, "Menu should remain open.");
|
|
|
++
|
|
|
++ // Test App Menu's Bookmarks Library stayopen clicks: middle-click.
|
|
|
++ promiseTabOpened = BrowserTestUtils.waitForNewTab(gBrowser, null);
|
|
|
++ EventUtils.synthesizeMouseAtCenter(testMenuitem, {button: 1});
|
|
|
++ newTab = await promiseTabOpened;
|
|
|
++ ok(true, "Bookmark middle-click opened new tab.");
|
|
|
++- await BrowserTestUtils.removeTab(newTab);
|
|
|
+++ BrowserTestUtils.removeTab(newTab);
|
|
|
++ ok(PanelView.forNode(BMview).active, "Should still show the bookmarks subview");
|
|
|
++ ok(appMenu.open, "Menu should remain open.");
|
|
|
++
|
|
|
++ // Close the App Menu
|
|
|
++ appMenuPopup.hidePopup();
|
|
|
++ ok(!appMenu.open, "The menu should now be closed.");
|
|
|
++
|
|
|
++ // Disable the rest of the tests on Mac due to Mac's handling of menus being
|
|
|
++@@ -169,23 +169,23 @@ add_task(async function testStayopenBook
|
|
|
++ menuitem = await locateBookmarkAndTestCtrlClick(BMpopup);
|
|
|
++ ok(BM.open, "Bookmarks Menu's Popup should still be open.");
|
|
|
++
|
|
|
++ // Test Bookmarks Menu (menubar) stayopen clicks: middle-click.
|
|
|
++ promiseTabOpened = BrowserTestUtils.waitForNewTab(gBrowser, null);
|
|
|
++ EventUtils.synthesizeMouseAtCenter(menuitem, {button: 1});
|
|
|
++ newTab = await promiseTabOpened;
|
|
|
++ ok(true, "Bookmark middle-click opened new tab.");
|
|
|
++- await BrowserTestUtils.removeTab(newTab);
|
|
|
+++ BrowserTestUtils.removeTab(newTab);
|
|
|
++ ok(BM.open, "Bookmarks Menu's Popup should still be open.");
|
|
|
++
|
|
|
++ // Test Bookmarks Menu (menubar) stayopen clicks: 'Open in new tab' on context menu.
|
|
|
++ newTab = await testContextmenu(menuitem);
|
|
|
++ ok(true, "Bookmark contextmenu opened new tab.");
|
|
|
++- await BrowserTestUtils.removeTab(newTab);
|
|
|
+++ BrowserTestUtils.removeTab(newTab);
|
|
|
++ ok(BM.open, "Bookmarks Menu's Popup should still be open.");
|
|
|
++ promiseEvent = BrowserTestUtils.waitForEvent(BMpopup, "popuphidden");
|
|
|
++ BM.open = false;
|
|
|
++ await promiseEvent;
|
|
|
++
|
|
|
++ // Test Bookmarks Toolbar stayopen clicks - Ctrl-click.
|
|
|
++ let BT = document.getElementById("PlacesToolbarItems");
|
|
|
++ let toolbarbutton = BT.firstChild;
|
|
|
++@@ -200,38 +200,38 @@ add_task(async function testStayopenBook
|
|
|
++ promiseTabOpened = BrowserTestUtils.waitForNewTab(gBrowser, null);
|
|
|
++ EventUtils.synthesizeMouseAtCenter(menuitem, {ctrlKey: true});
|
|
|
++ newTab = await promiseTabOpened;
|
|
|
++ ok(true, "Bookmark in folder on bookmark's toolbar ctrl-click opened new tab.");
|
|
|
++ ok(toolbarbutton.open, "Popup of folder on bookmark's toolbar should still be open.");
|
|
|
++ promiseEvent = BrowserTestUtils.waitForEvent(buttonMenupopup, "popuphidden");
|
|
|
++ toolbarbutton.open = false;
|
|
|
++ await promiseEvent;
|
|
|
++- await BrowserTestUtils.removeTab(newTab);
|
|
|
+++ BrowserTestUtils.removeTab(newTab);
|
|
|
++
|
|
|
++ // Test Bookmarks Toolbar stayopen clicks: middle-click.
|
|
|
++ promiseEvent = BrowserTestUtils.waitForEvent(buttonMenupopup, "popupshown");
|
|
|
++ EventUtils.synthesizeMouseAtCenter(toolbarbutton, {});
|
|
|
++ await promiseEvent;
|
|
|
++ ok(true, "Bookmarks toolbar folder's popup is open.");
|
|
|
++ promiseTabOpened = BrowserTestUtils.waitForNewTab(gBrowser, null);
|
|
|
++ EventUtils.synthesizeMouseAtCenter(menuitem, {button: 1});
|
|
|
++ newTab = await promiseTabOpened;
|
|
|
++ ok(true, "Bookmark in folder on Bookmarks Toolbar middle-click opened new tab.");
|
|
|
++ ok(toolbarbutton.open, "Popup of folder on bookmark's toolbar should still be open.");
|
|
|
++ promiseEvent = BrowserTestUtils.waitForEvent(buttonMenupopup, "popuphidden");
|
|
|
++ toolbarbutton.open = false;
|
|
|
++ await promiseEvent;
|
|
|
++- await BrowserTestUtils.removeTab(newTab);
|
|
|
+++ BrowserTestUtils.removeTab(newTab);
|
|
|
++
|
|
|
++ // Test Bookmarks Toolbar stayopen clicks: 'Open in new tab' on context menu.
|
|
|
++ promiseEvent = BrowserTestUtils.waitForEvent(buttonMenupopup, "popupshown");
|
|
|
++ EventUtils.synthesizeMouseAtCenter(toolbarbutton, {});
|
|
|
++ await promiseEvent;
|
|
|
++ ok(true, "Bookmarks toolbar folder's popup is open.");
|
|
|
++ newTab = await testContextmenu(menuitem);
|
|
|
++ ok(true, "Bookmark on Bookmarks Toolbar contextmenu opened new tab.");
|
|
|
++ ok(toolbarbutton.open, "Popup of folder on bookmark's toolbar should still be open.");
|
|
|
++ promiseEvent = BrowserTestUtils.waitForEvent(buttonMenupopup, "popuphidden");
|
|
|
++ toolbarbutton.open = false;
|
|
|
++ await promiseEvent;
|
|
|
++- await BrowserTestUtils.removeTab(newTab);
|
|
|
+++ BrowserTestUtils.removeTab(newTab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_bug1020245_openPreferences_to_paneContent.js b/browser/components/preferences/in-content-new/tests/browser_bug1020245_openPreferences_to_paneContent.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_bug1020245_openPreferences_to_paneContent.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_bug1020245_openPreferences_to_paneContent.js
|
|
|
+@@ -19,17 +19,17 @@ add_task(async function() {
|
|
|
+ is(prefs.selectedPane, "paneGeneral", "General pane is selected when hash is a nonexistant-category");
|
|
|
+ prefs = await openPreferencesViaHash();
|
|
|
+ is(prefs.selectedPane, "paneGeneral", "General pane is selected by default");
|
|
|
+ prefs = await openPreferencesViaOpenPreferencesAPI("privacy-reports", {leaveOpen: true});
|
|
|
+ is(prefs.selectedPane, "panePrivacy", "Privacy pane is selected by default");
|
|
|
+ let doc = gBrowser.contentDocument;
|
|
|
+ is(doc.location.hash, "#privacy", "The subcategory should be removed from the URI");
|
|
|
+ ok(doc.querySelector("#locationBarGroup").hidden, "Location Bar prefs should be hidden when only Reports are requested");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test opening Preferences with subcategory on an existing Preferences tab. See bug 1358475.
|
|
|
+ add_task(async function() {
|
|
|
+ let prefs = await openPreferencesViaOpenPreferencesAPI("general", {leaveOpen: true});
|
|
|
+ is(prefs.selectedPane, "paneGeneral", "General pane is selected by default");
|
|
|
+ let doc = gBrowser.contentDocument;
|
|
|
+ is(doc.location.hash, "#general", "The subcategory should be removed from the URI");
|
|
|
+@@ -37,17 +37,17 @@ add_task(async function() {
|
|
|
+ // - already opened one about:preferences tab up there and
|
|
|
+ // - the goal is to test on the existing tab and
|
|
|
+ // - using `openPreferencesViaOpenPreferencesAPI` would introduce more handling of additional about:blank and unneccessary event
|
|
|
+ openPreferences("privacy-reports");
|
|
|
+ let selectedPane = gBrowser.contentWindow.history.state;
|
|
|
+ is(selectedPane, "panePrivacy", "Privacy pane should be selected");
|
|
|
+ is(doc.location.hash, "#privacy", "The subcategory should be removed from the URI");
|
|
|
+ ok(doc.querySelector("#locationBarGroup").hidden, "Location Bar prefs should be hidden when only Reports are requested");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test opening to a subcategory displays the correct values for preferences
|
|
|
+ add_task(async function() {
|
|
|
+ // Skip if crash reporting isn't enabled since the checkbox will be missing.
|
|
|
+ if (!AppConstants.MOZ_CRASHREPORTER) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+@@ -58,17 +58,17 @@ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("privacy-reports", {leaveOpen: true});
|
|
|
+
|
|
|
+ let doc = gBrowser.contentDocument;
|
|
|
+ ok(
|
|
|
+ doc.querySelector("#automaticallySubmitCrashesBox").checked,
|
|
|
+ "Checkbox for automatically submitting crashes should be checked when the pref is true and only Reports are requested"
|
|
|
+ );
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ await SpecialPowers.popPrefEnv();
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ // Skip if crash reporting isn't enabled since the checkbox will be missing.
|
|
|
+ if (!AppConstants.MOZ_CRASHREPORTER) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+@@ -79,17 +79,17 @@ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("privacy-reports", {leaveOpen: true});
|
|
|
+
|
|
|
+ let doc = gBrowser.contentDocument;
|
|
|
+ ok(
|
|
|
+ !doc.querySelector("#automaticallySubmitCrashesBox").checked,
|
|
|
+ "Checkbox for automatically submitting crashes should not be checked when the pref is false only Reports are requested"
|
|
|
+ );
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ await SpecialPowers.popPrefEnv();
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
+ function openPreferencesViaHash(aPane) {
|
|
|
+ return new Promise(resolve => {
|
|
|
+ gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, "about:preferences" + (aPane ? "#" + aPane : ""));
|
|
|
+ let newTabBrowser = gBrowser.selectedBrowser;
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_checkspelling.js b/browser/components/preferences/in-content-new/tests/browser_checkspelling.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_checkspelling.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_checkspelling.js
|
|
|
+@@ -15,10 +15,10 @@ add_task(async function() {
|
|
|
+
|
|
|
+ checkbox.click();
|
|
|
+
|
|
|
+ is(checkbox.checked,
|
|
|
+ Services.prefs.getIntPref("layout.spellcheckDefault") == 2,
|
|
|
+ "checkbox should represent pref value after clicking on checkbox");
|
|
|
+ ok(!checkbox.checked, "checkbox should not be checked after clicking on checkbox");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_containers_name_input.js.1442465-4_2.later b/browser/components/preferences/in-content-new/tests/browser_containers_name_input.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_containers_name_input.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,18 @@
|
|
|
++--- browser_containers_name_input.js
|
|
|
+++++ browser_containers_name_input.js
|
|
|
++@@ -1,14 +1,14 @@
|
|
|
++ const CONTAINERS_URL = "chrome://browser/content/preferences/containers.xul";
|
|
|
++
|
|
|
++ add_task(async function setup() {
|
|
|
++ await openPreferencesViaOpenPreferencesAPI("containers", { leaveOpen: true });
|
|
|
++ registerCleanupFunction(async function() {
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ });
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function() {
|
|
|
++ async function openDialog() {
|
|
|
++ let doc = gBrowser.selectedBrowser.contentDocument;
|
|
|
++
|
|
|
++ let dialogPromise = promiseLoadSubDialog(CONTAINERS_URL);
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_cookies_exceptions.js.1442465-4_2.later b/browser/components/preferences/in-content-new/tests/browser_cookies_exceptions.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_cookies_exceptions.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_cookies_exceptions.js
|
|
|
+++++ browser_cookies_exceptions.js
|
|
|
++@@ -266,17 +266,17 @@ async function runTest(test, observances
|
|
|
++ allow: Ci.nsIPermissionManager.ALLOW_ACTION,
|
|
|
++ deny: Ci.nsIPermissionManager.DENY_ACTION,
|
|
|
++ };
|
|
|
++ let btnApplyChanges = doc.getElementById("btnApplyChanges");
|
|
|
++ let observeAllPromise = createObserveAllPromise(observances);
|
|
|
++
|
|
|
++ await test(params, observeAllPromise, () => btnApplyChanges.doCommand());
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ }
|
|
|
++
|
|
|
++ function createObserveAllPromise(observances) {
|
|
|
++ return new Promise(resolve => {
|
|
|
++ let permObserver = {
|
|
|
++ observe(aSubject, aTopic, aData) {
|
|
|
++ if (aTopic != "perm-changed")
|
|
|
++ return;
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_engines.js b/browser/components/preferences/in-content-new/tests/browser_engines.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_engines.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_engines.js
|
|
|
+@@ -16,11 +16,11 @@ add_task(async function() {
|
|
|
+ }
|
|
|
+
|
|
|
+ // Avoid duplicated keywords
|
|
|
+ tree.view.setCellText(0, tree.columns.getNamedColumn("engineKeyword"), "keyword");
|
|
|
+ tree.view.setCellText(1, tree.columns.getNamedColumn("engineKeyword"), "keyword");
|
|
|
+ let cellKeyword = tree.view.getCellText(1, tree.columns.getNamedColumn("engineKeyword"));
|
|
|
+ isnot(cellKeyword, "keyword", "Do not allow duplicated keywords");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_extension_controlled.js.1442465-4_2.later b/browser/components/preferences/in-content-new/tests/browser_extension_controlled.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_extension_controlled.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,127 @@
|
|
|
++--- browser_extension_controlled.js
|
|
|
+++++ browser_extension_controlled.js
|
|
|
++@@ -132,17 +132,17 @@ add_task(async function testExtensionCon
|
|
|
++ let addon = await AddonManager.getAddonByID("@set_homepage");
|
|
|
++ // Enable the extension so we get the UNINSTALL event, which is needed by
|
|
|
++ // ExtensionPreferencesManager to clean up properly.
|
|
|
++ // FIXME: See https://bugzilla.mozilla.org/show_bug.cgi?id=1408226.
|
|
|
++ addon.userDisabled = false;
|
|
|
++ await waitForMessageShown("browserHomePageExtensionContent");
|
|
|
++ // Do the uninstall now that the enable code has been run.
|
|
|
++ addon.uninstall();
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function testPrefLockedHomepage() {
|
|
|
++ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
++ let doc = gBrowser.contentDocument;
|
|
|
++ is(gBrowser.currentURI.spec, "about:preferences#general",
|
|
|
++ "#general should be in the URI for about:preferences");
|
|
|
++
|
|
|
++@@ -263,17 +263,17 @@ add_task(async function testPrefLockedHo
|
|
|
++ is(homePageInput.value, "", "The homepage is clear after being unlocked");
|
|
|
++ is(homePageInput.disabled, false, "The homepage is enabled after clearing lock");
|
|
|
++ buttonPrefs.forEach(pref => {
|
|
|
++ is(getButton(pref).disabled, false, `The ${pref} button is enabled when unlocked`);
|
|
|
++ });
|
|
|
++ is(controlledContent.hidden, true,
|
|
|
++ "The extension controlled message is hidden when unlocked with no extension");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function testExtensionControlledNewTab() {
|
|
|
++ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
++ let doc = gBrowser.contentDocument;
|
|
|
++ is(gBrowser.currentURI.spec, "about:preferences#general",
|
|
|
++ "#general should be in the URI for about:preferences");
|
|
|
++
|
|
|
++@@ -310,17 +310,17 @@ add_task(async function testExtensionCon
|
|
|
++ dismissButton.click();
|
|
|
++ await hidden;
|
|
|
++
|
|
|
++ // Ensure the New Tab page has been reset and there is no message.
|
|
|
++ ok(!aboutNewTabService.newTabURL.startsWith("moz-extension:"), "new tab page is set back to default");
|
|
|
++ is(controlledContent.hidden, true, "The extension controlled row is shown");
|
|
|
++
|
|
|
++ // Cleanup the tab and add-on.
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ let addon = await AddonManager.getAddonByID("@set_newtab");
|
|
|
++ addon.uninstall();
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function testExtensionControlledDefaultSearch() {
|
|
|
++ await openPreferencesViaOpenPreferencesAPI("paneSearch", {leaveOpen: true});
|
|
|
++ let doc = gBrowser.contentDocument;
|
|
|
++ let extensionId = "@set_default_search";
|
|
|
++@@ -406,34 +406,34 @@ add_task(async function testExtensionCon
|
|
|
++ // Verify the extension is updated and search engine didn't change.
|
|
|
++ is(addon.version, "2.0", "The updated addon has the expected version");
|
|
|
++ is(controlledContent.hidden, true, "The extension controlled row is hidden after update");
|
|
|
++ is(initialEngine, Services.search.currentEngine,
|
|
|
++ "default search engine is still the initial engine after update");
|
|
|
++
|
|
|
++ await originalExtension.unload();
|
|
|
++ await updatedExtension.unload();
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function testExtensionControlledHomepageUninstalledAddon() {
|
|
|
++ async function checkHomepageEnabled() {
|
|
|
++ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
++ let doc = gBrowser.contentDocument;
|
|
|
++ is(gBrowser.currentURI.spec, "about:preferences#general",
|
|
|
++ "#general should be in the URI for about:preferences");
|
|
|
++ let controlledContent = doc.getElementById("browserHomePageExtensionContent");
|
|
|
++
|
|
|
++ // The homepage is enabled.
|
|
|
++ let homepageInut = doc.getElementById("browserHomePage");
|
|
|
++ is(homepageInut.disabled, false, "The homepage input is enabled");
|
|
|
++ is(homepageInut.value, "", "The homepage input is empty");
|
|
|
++ is(controlledContent.hidden, true, "The extension controlled row is hidden");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ }
|
|
|
++
|
|
|
++ await ExtensionSettingsStore.initialize();
|
|
|
++
|
|
|
++ // Verify the setting isn't reported as controlled and the inputs are enabled.
|
|
|
++ is(ExtensionSettingsStore.getSetting("prefs", "homepage_override"), null,
|
|
|
++ "The homepage_override is not set");
|
|
|
++ await checkHomepageEnabled();
|
|
|
++@@ -607,17 +607,17 @@ add_task(async function testExtensionCon
|
|
|
++
|
|
|
++ // Enable the extension so we get the UNINSTALL event, which is needed by
|
|
|
++ // ExtensionPreferencesManager to clean up properly.
|
|
|
++ // TODO: BUG 1408226
|
|
|
++ await reEnableExtension(addon);
|
|
|
++
|
|
|
++ await extension.unload();
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function testExtensionControlledProxyConfig() {
|
|
|
++ const proxySvc = Ci.nsIProtocolProxyService;
|
|
|
++ const PROXY_DEFAULT = proxySvc.PROXYCONFIG_SYSTEM;
|
|
|
++ const EXTENSION_ID = "@set_proxy";
|
|
|
++ const CONTROLLED_SECTION_ID = "proxyExtensionContent";
|
|
|
++ const CONTROLLED_BUTTON_ID = "disableProxyExtension";
|
|
|
++@@ -809,10 +809,10 @@ add_task(async function testExtensionCon
|
|
|
++
|
|
|
++ // Enable the extension so we get the UNINSTALL event, which is needed by
|
|
|
++ // ExtensionPreferencesManager to clean up properly.
|
|
|
++ // TODO: BUG 1408226
|
|
|
++ await reEnableExtension(addon);
|
|
|
++
|
|
|
++ await extension.unload();
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_fluent.js.1442465-4_2.later b/browser/components/preferences/in-content-new/tests/browser_fluent.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_fluent.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,14 @@
|
|
|
++--- browser_fluent.js
|
|
|
+++++ browser_fluent.js
|
|
|
++@@ -39,10 +39,10 @@ add_task(async function() {
|
|
|
++
|
|
|
++ Assert.deepEqual(msg, {
|
|
|
++ value: null,
|
|
|
++ attrs: [
|
|
|
++ {name: "label", value: elem.getAttribute("label")}
|
|
|
++ ]
|
|
|
++ });
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_layersacceleration.js b/browser/components/preferences/in-content-new/tests/browser_layersacceleration.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_layersacceleration.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_layersacceleration.js
|
|
|
+@@ -13,10 +13,10 @@ add_task(async function() {
|
|
|
+ Services.prefs.getBoolPref("layers.acceleration.disabled"),
|
|
|
+ "checkbox should represent inverted pref value before clicking on checkbox");
|
|
|
+
|
|
|
+ checkbox.click();
|
|
|
+
|
|
|
+ is(!checkbox.checked,
|
|
|
+ Services.prefs.getBoolPref("layers.acceleration.disabled"),
|
|
|
+ "checkbox should represent inverted pref value after clicking on checkbox");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_masterpassword.js b/browser/components/preferences/in-content-new/tests/browser_masterpassword.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_masterpassword.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_masterpassword.js
|
|
|
+@@ -45,10 +45,10 @@ add_task(async function() {
|
|
|
+ dialogURL = "";
|
|
|
+ checkbox.click();
|
|
|
+ is(dialogURL,
|
|
|
+ "chrome://mozapps/content/preferences/removemp.xul",
|
|
|
+ "clicking on the checkbox to uncheck master password should show the removal dialog");
|
|
|
+ ok(button.disabled, "master password button should now be disabled");
|
|
|
+ ok(!checkbox.checked, "master password checkbox should now be unchecked");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_performance.js b/browser/components/preferences/in-content-new/tests/browser_performance.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_performance.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_performance.js
|
|
|
+@@ -66,17 +66,17 @@ add_task(async function() {
|
|
|
+ contentProcessCount.value = DEFAULT_PROCESS_COUNT;
|
|
|
+ contentProcessCount.doCommand();
|
|
|
+ is(Services.prefs.getIntPref("dom.ipc.processCount"), DEFAULT_PROCESS_COUNT, "pref value should be default value");
|
|
|
+ is(contentProcessCount.selectedItem.value, DEFAULT_PROCESS_COUNT, "selected item should be default one");
|
|
|
+
|
|
|
+ is(performanceSettings.hidden, false, "performance settings section should be still shown");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ let prefs = await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ is(prefs.selectedPane, "paneGeneral", "General pane was selected");
|
|
|
+
|
|
|
+ let doc = gBrowser.contentDocument;
|
|
|
+ let useRecommendedPerformanceSettings = doc.querySelector("#useRecommendedPerformanceSettings");
|
|
|
+@@ -91,34 +91,34 @@ add_task(async function() {
|
|
|
+ useRecommendedPerformanceSettings.click();
|
|
|
+
|
|
|
+ is(Services.prefs.getBoolPref("browser.preferences.defaultPerformanceSettings.enabled"), true,
|
|
|
+ "pref value should be true before clicking on checkbox");
|
|
|
+ ok(useRecommendedPerformanceSettings.checked, "checkbox should be checked before clicking on checkbox");
|
|
|
+ is(performanceSettings.hidden, true, "performance settings section should be still shown");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ let prefs = await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ is(prefs.selectedPane, "paneGeneral", "General pane was selected");
|
|
|
+
|
|
|
+ let doc = gBrowser.contentDocument;
|
|
|
+ let performanceSettings = doc.querySelector("#performanceSettings");
|
|
|
+
|
|
|
+ is(performanceSettings.hidden, true, "performance settings section should not be shown");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", false);
|
|
|
+
|
|
|
+ is(performanceSettings.hidden, false, "performance settings section should be shown");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ Services.prefs.setIntPref("dom.ipc.processCount", 7);
|
|
|
+
|
|
|
+ let prefs = await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ is(prefs.selectedPane, "paneGeneral", "General pane was selected");
|
|
|
+
|
|
|
+@@ -127,17 +127,17 @@ add_task(async function() {
|
|
|
+ let performanceSettings = doc.querySelector("#performanceSettings");
|
|
|
+ is(performanceSettings.hidden, false, "performance settings section should be shown");
|
|
|
+
|
|
|
+ let contentProcessCount = doc.querySelector("#contentProcessCount");
|
|
|
+ is(Services.prefs.getIntPref("dom.ipc.processCount"), 7, "pref value should be 7");
|
|
|
+ is(contentProcessCount.selectedItem.value, 7, "selected item should be 7");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ Services.prefs.setBoolPref("layers.acceleration.disabled", true);
|
|
|
+
|
|
|
+ let prefs = await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ is(prefs.selectedPane, "paneGeneral", "General pane was selected");
|
|
|
+
|
|
|
+@@ -147,10 +147,10 @@ add_task(async function() {
|
|
|
+ is(performanceSettings.hidden, false, "performance settings section should be shown");
|
|
|
+
|
|
|
+ let allowHWAccel = doc.querySelector("#allowHWAccel");
|
|
|
+ is(Services.prefs.getBoolPref("layers.acceleration.disabled"), true,
|
|
|
+ "pref value is false");
|
|
|
+ ok(!allowHWAccel.checked, "checkbox should not be checked");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_performance_e10srollout.js b/browser/components/preferences/in-content-new/tests/browser_performance_e10srollout.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_performance_e10srollout.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_performance_e10srollout.js
|
|
|
+@@ -33,17 +33,17 @@ add_task(async function() {
|
|
|
+ "pref value should be false after clicking on checkbox");
|
|
|
+ ok(!useRecommendedPerformanceSettings.checked, "checkbox should not be checked after clicking on checkbox");
|
|
|
+
|
|
|
+ let contentProcessCount = doc.querySelector("#contentProcessCount");
|
|
|
+ is(contentProcessCount.disabled, false, "process count control should be enabled");
|
|
|
+ is(Services.prefs.getIntPref("dom.ipc.processCount"), DEFAULT_PROCESS_COUNT + 1, "e10s rollout value should be default value");
|
|
|
+ is(contentProcessCount.selectedItem.value, DEFAULT_PROCESS_COUNT + 1, "selected item should be the default one");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ Services.prefs.clearUserPref("dom.ipc.processCount");
|
|
|
+ Services.prefs.clearUserPref("dom.ipc.processCount.web");
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ Services.prefs.clearUserPref("dom.ipc.processCount");
|
|
|
+@@ -57,17 +57,17 @@ add_task(async function() {
|
|
|
+ let performanceSettings = doc.querySelector("#performanceSettings");
|
|
|
+ is(performanceSettings.hidden, false, "performance settings section is shown");
|
|
|
+
|
|
|
+ let contentProcessCount = doc.querySelector("#contentProcessCount");
|
|
|
+ is(contentProcessCount.disabled, false, "process count control should be enabled");
|
|
|
+ is(Services.prefs.getIntPref("dom.ipc.processCount"), DEFAULT_PROCESS_COUNT, "default value should be the current value");
|
|
|
+ is(contentProcessCount.selectedItem.value, DEFAULT_PROCESS_COUNT, "selected item should be the default one");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ Services.prefs.clearUserPref("dom.ipc.processCount");
|
|
|
+ Services.prefs.clearUserPref("dom.ipc.processCount.web");
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ Services.prefs.setIntPref("dom.ipc.processCount", DEFAULT_PROCESS_COUNT + 2);
|
|
|
+@@ -89,14 +89,14 @@ add_task(async function() {
|
|
|
+ let useRecommendedPerformanceSettings = doc.querySelector("#useRecommendedPerformanceSettings");
|
|
|
+ useRecommendedPerformanceSettings.click();
|
|
|
+
|
|
|
+ is(Services.prefs.getBoolPref("browser.preferences.defaultPerformanceSettings.enabled"), true,
|
|
|
+ "pref value should be true after clicking on checkbox");
|
|
|
+ is(Services.prefs.getIntPref("dom.ipc.processCount"), DEFAULT_PROCESS_COUNT,
|
|
|
+ "process count should be default value");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ Services.prefs.clearUserPref("dom.ipc.processCount");
|
|
|
+ Services.prefs.clearUserPref("dom.ipc.processCount.web");
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_performance_non_e10s.js b/browser/components/preferences/in-content-new/tests/browser_performance_non_e10s.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_performance_non_e10s.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_performance_non_e10s.js
|
|
|
+@@ -54,34 +54,34 @@ add_task(async function() {
|
|
|
+ allowHWAccelPref = Services.prefs.getBoolPref("layers.acceleration.disabled");
|
|
|
+ is(allowHWAccelPref, DEFAULT_HW_ACCEL_PREF,
|
|
|
+ "pref value should be the default value after clicking on checkbox");
|
|
|
+ is(allowHWAccel.checked, !allowHWAccelPref, "checkbox should show the invert of the current value");
|
|
|
+
|
|
|
+ is(performanceSettings.hidden, false, "performance settings section should be still shown");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ let prefs = await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ is(prefs.selectedPane, "paneGeneral", "General pane was selected");
|
|
|
+
|
|
|
+ let doc = gBrowser.contentDocument;
|
|
|
+ let performanceSettings = doc.querySelector("#performanceSettings");
|
|
|
+
|
|
|
+ is(performanceSettings.hidden, true, "performance settings section should not be shown");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", false);
|
|
|
+
|
|
|
+ is(performanceSettings.hidden, false, "performance settings section should be shown");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ Services.prefs.setBoolPref("layers.acceleration.disabled", true);
|
|
|
+
|
|
|
+ let prefs = await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ is(prefs.selectedPane, "paneGeneral", "General pane was selected");
|
|
|
+
|
|
|
+@@ -91,10 +91,10 @@ add_task(async function() {
|
|
|
+ is(performanceSettings.hidden, false, "performance settings section should be shown");
|
|
|
+
|
|
|
+ let allowHWAccel = doc.querySelector("#allowHWAccel");
|
|
|
+ is(Services.prefs.getBoolPref("layers.acceleration.disabled"), true,
|
|
|
+ "pref value is false");
|
|
|
+ ok(!allowHWAccel.checked, "checkbox should not be checked");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_privacypane.js.1442465-4_2.later b/browser/components/preferences/in-content-new/tests/browser_privacypane.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_privacypane.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,34 @@
|
|
|
++--- browser_privacypane.js
|
|
|
+++++ browser_privacypane.js
|
|
|
++@@ -14,17 +14,17 @@ add_task(async function testBrowserError
|
|
|
++ await openPreferencesViaOpenPreferencesAPI("privacy-reports", {leaveOpen: true});
|
|
|
++
|
|
|
++ let doc = gBrowser.contentDocument;
|
|
|
++ ok(
|
|
|
++ doc.querySelector("#collectBrowserErrorsBox").checked,
|
|
|
++ "Checkbox for collecting browser errors should be checked when the pref is true"
|
|
|
++ );
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ await SpecialPowers.popPrefEnv();
|
|
|
++ });
|
|
|
++
|
|
|
++ // Test that the Learn More link is set to the correct, formatted URL from a
|
|
|
++ // pref value
|
|
|
++ add_task(async function testBrowserErrorLearnMore() {
|
|
|
++ // Skip if non-Nightly since the checkbox will be missing.
|
|
|
++ if (!AppConstants.NIGHTLY_BUILD) {
|
|
|
++@@ -38,11 +38,11 @@ add_task(async function testBrowserError
|
|
|
++
|
|
|
++ let doc = gBrowser.contentDocument;
|
|
|
++ is(
|
|
|
++ doc.querySelector("#collectBrowserErrorsLearnMore").href,
|
|
|
++ `https://example.com/${Services.appinfo.name}/`,
|
|
|
++ "Learn More link for browser error collection should have an href set by a pref"
|
|
|
++ );
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ await SpecialPowers.popPrefEnv();
|
|
|
++ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_1.js b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_1.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_1.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_1.js
|
|
|
+@@ -8,19 +8,19 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Set Home Page" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("Set Home Page", "startupGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Languages" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("Choose languages", "languagesGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_2.js b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_2.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_2.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_2.js
|
|
|
+@@ -11,19 +11,19 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Saved Logins" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("sites are stored", "passwordsGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Exceptions - Tracking Protection" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("disabled Tracking Protection", "trackingGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_3.js b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_3.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_3.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_3.js
|
|
|
+@@ -10,19 +10,19 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Allowed Sites - Add-ons Installation" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("allowed to install add-ons", "permissionsGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Certificate Manager" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("identify these certificate authorities", "certSelection");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_4.js b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_4.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_4.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_4.js
|
|
|
+@@ -8,19 +8,19 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Update History" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("updates have been installed", "updateApp");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Location Permissions" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("set location permissions", "permissionsGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_5.js b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_5.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_5.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_5.js
|
|
|
+@@ -10,28 +10,28 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Fonts" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("Text Encoding", "fontsGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Colors" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("Link Colors", "fontsGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Exceptions - Saved Logins" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("sites will not be saved", "passwordsGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_6.js b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_6.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_6.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_6.js
|
|
|
+@@ -11,19 +11,19 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Block Lists" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("block Web elements", "trackingGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Allowed Sites - Pop-ups" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("open pop-up windows", "permissionsGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_7.js b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_7.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_7.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_7.js
|
|
|
+@@ -12,28 +12,28 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Device Manager" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("Security Modules and Devices", "certSelection");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Connection Settings" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("Use system proxy settings", "connectionGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Settings - Site Data" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("store site data on your computer", "siteDataGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_8.js b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_8.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_8.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_8.js
|
|
|
+@@ -10,28 +10,28 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Camera Permissions" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("set camera permissions", "permissionsGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Microphone Permissions" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("set microphone permissions", "permissionsGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for searching for the "Notification Permissions" subdialog.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ await evaluateSearchResults("set notifications permissions", "permissionsGroup");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_site_data.js.1442465-4_2.later b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_site_data.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_site_data.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,35 @@
|
|
|
++--- browser_search_subdialogs_within_preferences_site_data.js
|
|
|
+++++ browser_search_subdialogs_within_preferences_site_data.js
|
|
|
++@@ -8,28 +8,28 @@ add_task(async function() {
|
|
|
++ });
|
|
|
++
|
|
|
++ /**
|
|
|
++ * Test for searching for the "Settings - Site Data" subdialog.
|
|
|
++ */
|
|
|
++ add_task(async function() {
|
|
|
++ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
++ await evaluateSearchResults("cookies", ["siteDataGroup", "historyGroup"]);
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function() {
|
|
|
++ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
++ await evaluateSearchResults("site data", ["siteDataGroup", "historyGroup"]);
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function() {
|
|
|
++ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
++ await evaluateSearchResults("cache", ["siteDataGroup", "historyGroup"]);
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function() {
|
|
|
++ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
++ await evaluateSearchResults("third-party", "siteDataGroup");
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_search_within_preferences_1.js b/browser/components/preferences/in-content-new/tests/browser_search_within_preferences_1.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_search_within_preferences_1.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_search_within_preferences_1.js
|
|
|
+@@ -9,17 +9,17 @@ requestLongerTimeout(6);
|
|
|
+ * Tests to see if search bar is being hidden when pref is turned off
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await SpecialPowers.pushPrefEnv({"set": [["browser.preferences.search", false]]});
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ let searchInput = gBrowser.contentDocument.querySelectorAll("#searchInput");
|
|
|
+ is(searchInput.length, 1, "There should only be one element name searchInput querySelectorAll");
|
|
|
+ is_element_hidden(searchInput[0], "Search box should be hidden");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ await SpecialPowers.popPrefEnv();
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Enabling searching functionality. Will display search bar from this testcase forward.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await SpecialPowers.pushPrefEnv({"set": [["browser.preferences.search", true]]});
|
|
|
+@@ -27,17 +27,17 @@ add_task(async function() {
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Tests to see if search bar is being shown when pref is turned on
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ let searchInput = gBrowser.contentDocument.getElementById("searchInput");
|
|
|
+ is_element_visible(searchInput, "Search box should be shown");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for "Search Result" panel.
|
|
|
+ * After it runs a search, it tests if the "Search Results" panel is the only selected category.
|
|
|
+ * The search is then cleared, it then tests if the "General" panel is the only selected category.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+@@ -75,17 +75,17 @@ add_task(async function() {
|
|
|
+ let child = categoriesList.children[i]
|
|
|
+ if (child.id == "category-general") {
|
|
|
+ is(child.selected, true, "General panel should be selected");
|
|
|
+ } else if (child.id) {
|
|
|
+ is(child.selected, false, "No other panel should be selected");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for "password" case. When we search "password", it should show the "passwordGroup"
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+
|
|
|
+@@ -147,17 +147,17 @@ add_task(async function() {
|
|
|
+ || child.id == "browsingCategory"
|
|
|
+ || child.id == "networkProxyCategory") {
|
|
|
+ is_element_visible(child, "Should be in general tab");
|
|
|
+ } else if (child.id) {
|
|
|
+ is_element_hidden(child, "Should not be in general tab");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for if nothing is found
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+
|
|
|
+@@ -185,17 +185,17 @@ add_task(async function() {
|
|
|
+ let count = query.length;
|
|
|
+ while (count--) {
|
|
|
+ EventUtils.sendKey("BACK_SPACE");
|
|
|
+ }
|
|
|
+ await searchCompletedPromise;
|
|
|
+
|
|
|
+ is_element_hidden(noResultsEl, "Should not be in search results");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for if we go back to general tab after search case
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("privacy", {leaveOpen: true});
|
|
|
+ let generalPane = gBrowser.contentDocument.getElementById("generalCategory");
|
|
|
+@@ -221,17 +221,17 @@ add_task(async function() {
|
|
|
+ while (count--) {
|
|
|
+ EventUtils.sendKey("BACK_SPACE");
|
|
|
+ }
|
|
|
+ await searchCompletedPromise;
|
|
|
+
|
|
|
+ // Checks if back to normal
|
|
|
+ is_element_visible(generalPane, "Should be in generalPane");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test for if we go to another tab after searching
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
|
|
|
+ let searchInput = gBrowser.contentDocument.getElementById("searchInput");
|
|
|
+@@ -253,10 +253,10 @@ add_task(async function() {
|
|
|
+ let child = categoriesList.children[i]
|
|
|
+ if (child.id == "category-privacy") {
|
|
|
+ is(child.selected, true, "Privacy panel should be selected");
|
|
|
+ } else if (child.id) {
|
|
|
+ is(child.selected, false, "No other panel should be selected");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_search_within_preferences_2.js b/browser/components/preferences/in-content-new/tests/browser_search_within_preferences_2.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_search_within_preferences_2.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_search_within_preferences_2.js
|
|
|
+@@ -58,10 +58,10 @@ add_task(async function() {
|
|
|
+ searchCompletedPromise = BrowserTestUtils.waitForEvent(
|
|
|
+ gBrowser.contentWindow, "PreferencesSearchCompleted", evt => evt.detail == query);
|
|
|
+ EventUtils.sendString(query);
|
|
|
+ await searchCompletedPromise;
|
|
|
+
|
|
|
+ let noResultsEl = gBrowser.contentDocument.querySelector(".no-results-message");
|
|
|
+ is_element_visible(noResultsEl, "Should be reporting no results");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_search_within_preferences_command.js b/browser/components/preferences/in-content-new/tests/browser_search_within_preferences_command.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_search_within_preferences_command.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_search_within_preferences_command.js
|
|
|
+@@ -27,10 +27,10 @@ add_task(async function() {
|
|
|
+ gBrowser.contentWindow, "PreferencesSearchCompleted", evt => evt.detail == "");
|
|
|
+ searchInput.value = "";
|
|
|
+ searchInput.doCommand();
|
|
|
+ await searchCompletedPromise;
|
|
|
+
|
|
|
+ // Checks if back to normal
|
|
|
+ is_element_visible(generalPane, "Should be in generalPane");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_security-1.js b/browser/components/preferences/in-content-new/tests/browser_security-1.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_security-1.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_security-1.js
|
|
|
+@@ -17,17 +17,17 @@ registerCleanupFunction(function() {
|
|
|
+
|
|
|
+ // This test only opens the Preferences once, and then reloads the page
|
|
|
+ // each time that it wants to test various preference combinations. We
|
|
|
+ // only use one tab (instead of opening/closing for each test) for all
|
|
|
+ // to help improve test times on debug builds.
|
|
|
+ add_task(async function setup() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ // test the safebrowsing preference
|
|
|
+ add_task(async function() {
|
|
|
+ async function checkPrefSwitch(val1, val2) {
|
|
|
+ Services.prefs.setBoolPref("browser.safebrowsing.phishing.enabled", val1);
|
|
|
+ Services.prefs.setBoolPref("browser.safebrowsing.malware.enabled", val2);
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_security-2.js b/browser/components/preferences/in-content-new/tests/browser_security-2.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/browser_security-2.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_security-2.js
|
|
|
+@@ -17,17 +17,17 @@ registerCleanupFunction(function() {
|
|
|
+
|
|
|
+ // This test only opens the Preferences once, and then reloads the page
|
|
|
+ // each time that it wants to test various preference combinations. We
|
|
|
+ // only use one tab (instead of opening/closing for each test) for all
|
|
|
+ // to help improve test times on debug builds.
|
|
|
+ add_task(async function setup() {
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ // test the download protection preference
|
|
|
+ add_task(async function() {
|
|
|
+ async function checkPrefSwitch(val) {
|
|
|
+ Services.prefs.setBoolPref("browser.safebrowsing.downloads.enabled", val);
|
|
|
+
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/browser_spotlight.js.1442465-4_2.later b/browser/components/preferences/in-content-new/tests/browser_spotlight.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/browser_spotlight.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,43 @@
|
|
|
++--- browser_spotlight.js
|
|
|
+++++ browser_spotlight.js
|
|
|
++@@ -3,37 +3,37 @@ add_task(async function test_reports_sec
|
|
|
++ let prefs = await openPreferencesViaOpenPreferencesAPI("privacy-reports", {leaveOpen: true});
|
|
|
++ is(prefs.selectedPane, "panePrivacy", "Privacy pane is selected by default");
|
|
|
++ let doc = gBrowser.contentDocument;
|
|
|
++ is(doc.location.hash, "#privacy", "The subcategory should be removed from the URI");
|
|
|
++ await TestUtils.waitForCondition(() => doc.querySelector(".spotlight"),
|
|
|
++ "Wait for the reports section is spotlighted.");
|
|
|
++ is(doc.querySelector(".spotlight").getAttribute("data-subcategory"), "reports",
|
|
|
++ "The reports section is spotlighted.");
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function test_address_autofill_section() {
|
|
|
++ let prefs = await openPreferencesViaOpenPreferencesAPI("privacy-address-autofill", {leaveOpen: true});
|
|
|
++ is(prefs.selectedPane, "panePrivacy", "Privacy pane is selected by default");
|
|
|
++ let doc = gBrowser.contentDocument;
|
|
|
++ is(doc.location.hash, "#privacy", "The subcategory should be removed from the URI");
|
|
|
++ await TestUtils.waitForCondition(() => doc.querySelector(".spotlight"),
|
|
|
++ "Wait for the ddress-autofill section is spotlighted.");
|
|
|
++ is(doc.querySelector(".spotlight").getAttribute("data-subcategory"), "address-autofill",
|
|
|
++ "The ddress-autofill section is spotlighted.");
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function test_credit_card_autofill_section() {
|
|
|
++ if (!Services.prefs.getBoolPref("extensions.formautofill.creditCards.available")) {
|
|
|
++ return;
|
|
|
++ }
|
|
|
++ let prefs = await openPreferencesViaOpenPreferencesAPI("privacy-credit-card-autofill", {leaveOpen: true});
|
|
|
++ is(prefs.selectedPane, "panePrivacy", "Privacy pane is selected by default");
|
|
|
++ let doc = gBrowser.contentDocument;
|
|
|
++ is(doc.location.hash, "#privacy", "The subcategory should be removed from the URI");
|
|
|
++ await TestUtils.waitForCondition(() => doc.querySelector(".spotlight"),
|
|
|
++ "Wait for the credit-card-autofill section is spotlighted.");
|
|
|
++ is(doc.querySelector(".spotlight").getAttribute("data-subcategory"), "credit-card-autofill",
|
|
|
++ "The credit-card-autofill section is spotlighted.");
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/privacypane_tests_perwindow.js b/browser/components/preferences/in-content-new/tests/privacypane_tests_perwindow.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/privacypane_tests_perwindow.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/privacypane_tests_perwindow.js
|
|
|
+@@ -4,17 +4,17 @@
|
|
|
+ async function runTestOnPrivacyPrefPane(testFunc) {
|
|
|
+ info("runTestOnPrivacyPrefPane entered");
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:preferences", true, true);
|
|
|
+ let browser = tab.linkedBrowser;
|
|
|
+ info("loaded about:preferences");
|
|
|
+ browser.contentWindow.gotoPref("panePrivacy");
|
|
|
+ info("viewing privacy pane, executing testFunc");
|
|
|
+ testFunc(browser.contentWindow);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ function controlChanged(element) {
|
|
|
+ element.doCommand();
|
|
|
+ }
|
|
|
+
|
|
|
+ // We can only test the panes that don't trigger a preference update
|
|
|
+ function test_pane_visibility(win) {
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/siteData/browser_clearSiteData.js b/browser/components/preferences/in-content-new/tests/siteData/browser_clearSiteData.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/siteData/browser_clearSiteData.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/siteData/browser_clearSiteData.js
|
|
|
+@@ -6,26 +6,26 @@
|
|
|
+ ChromeUtils.import("resource:///modules/SitePermissions.jsm");
|
|
|
+
|
|
|
+ async function testClearData(clearSiteData, clearCache) {
|
|
|
+ let quotaURI = Services.io.newURI(TEST_QUOTA_USAGE_ORIGIN);
|
|
|
+ SitePermissions.set(quotaURI, "persistent-storage", SitePermissions.ALLOW);
|
|
|
+
|
|
|
+ // Open a test site which saves into appcache.
|
|
|
+ await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_OFFLINE_URL);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ // Fill indexedDB with test data.
|
|
|
+ // Don't wait for the page to load, to register the content event handler as quickly as possible.
|
|
|
+ // If this test goes intermittent, we might have to tell the page to wait longer before
|
|
|
+ // firing the event.
|
|
|
+ BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_QUOTA_USAGE_URL, false);
|
|
|
+ await BrowserTestUtils.waitForContentEvent(
|
|
|
+ gBrowser.selectedBrowser, "test-indexedDB-done", false, null, true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ // Register some service workers.
|
|
|
+ await loadServiceWorkerTestPage(TEST_SERVICE_WORKER_URL);
|
|
|
+ await promiseServiceWorkerRegisteredFor(TEST_SERVICE_WORKER_URL);
|
|
|
+
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
|
|
|
+
|
|
|
+ // Test the initial states.
|
|
|
+@@ -141,17 +141,17 @@ async function testClearData(clearSiteDa
|
|
|
+ () => sizeLabel.textContent != opts.initialSizeLabelValue, "Site data size label should have updated.");
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ let desiredPermissionState = clearSiteData ? SitePermissions.UNKNOWN : SitePermissions.ALLOW;
|
|
|
+ let permission = SitePermissions.get(quotaURI, "persistent-storage");
|
|
|
+ is(permission.state, desiredPermissionState, "Should have the correct permission state.");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ await SiteDataManager.removeAll();
|
|
|
+ }
|
|
|
+
|
|
|
+ // Test opening the "Clear All Data" dialog and cancelling.
|
|
|
+ add_task(async function() {
|
|
|
+ await testClearData(false, false);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/siteData/browser_siteData.js b/browser/components/preferences/in-content-new/tests/siteData/browser_siteData.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/siteData/browser_siteData.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/siteData/browser_siteData.js
|
|
|
+@@ -9,23 +9,23 @@ function getPersistentStoragePermStatus(
|
|
|
+ return Services.perms.testExactPermissionFromPrincipal(principal, "persistent-storage");
|
|
|
+ }
|
|
|
+
|
|
|
+ // Test listing site using quota usage or site using appcache
|
|
|
+ // This is currently disabled because of bug 1414751.
|
|
|
+ add_task(async function() {
|
|
|
+ // Open a test site which would save into appcache
|
|
|
+ await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_OFFLINE_URL);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ // Open a test site which would save into quota manager
|
|
|
+ BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_QUOTA_USAGE_URL);
|
|
|
+ await BrowserTestUtils.waitForContentEvent(
|
|
|
+ gBrowser.selectedBrowser, "test-indexedDB-done", false, null, true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ let updatedPromise = promiseSiteDataManagerSitesUpdated();
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
|
|
|
+ await updatedPromise;
|
|
|
+ await openSiteDataSettingsDialog();
|
|
|
+ let dialog = content.gSubDialog._topDialog;
|
|
|
+ let dialogFrame = dialog._frame;
|
|
|
+ let frameDoc = dialogFrame.contentDocument;
|
|
|
+@@ -44,17 +44,17 @@ add_task(async function() {
|
|
|
+ await new Promise(resolve => {
|
|
|
+ let principal = Services.scriptSecurityManager
|
|
|
+ .createCodebasePrincipalFromOrigin(TEST_QUOTA_USAGE_ORIGIN);
|
|
|
+ let request = Services.qms.clearStoragesForPrincipal(principal, null, true);
|
|
|
+ request.callback = resolve;
|
|
|
+ });
|
|
|
+
|
|
|
+ await SiteDataManager.removeAll();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ }).skip(); // Bug 1414751
|
|
|
+
|
|
|
+ // Test buttons are disabled and loading message shown while updating sites
|
|
|
+ add_task(async function() {
|
|
|
+ let updatedPromise = promiseSiteDataManagerSitesUpdated();
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
|
|
|
+ await updatedPromise;
|
|
|
+ let cacheSize = await SiteDataManager.getCacheSize();
|
|
|
+@@ -90,17 +90,17 @@ add_task(async function() {
|
|
|
+ await SiteDataManager.getTotalUsage()
|
|
|
+ .then(usage => {
|
|
|
+ actual = totalSiteDataSizeLabel.textContent;
|
|
|
+ expected = prefStrBundle.getFormattedString(
|
|
|
+ "totalSiteDataSize1", DownloadUtils.convertByteUnits(usage + cacheSize));
|
|
|
+ is(actual, expected, "Should show the right total site data size");
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test clearing service wroker through the "Clear All" button
|
|
|
+ add_task(async function() {
|
|
|
+ // Register a test service
|
|
|
+ await loadServiceWorkerTestPage(TEST_SERVICE_WORKER_URL);
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
|
|
|
+ // Test the initial states
|
|
|
+@@ -111,17 +111,17 @@ add_task(async function() {
|
|
|
+ let acceptPromise = promiseAlertDialogOpen("accept");
|
|
|
+ mockSiteDataManager.register(SiteDataManager);
|
|
|
+ mockSiteDataManager.fakeSites = [
|
|
|
+ let updatePromise = promiseSiteDataManagerSitesUpdated();
|
|
|
+ clearBtn.doCommand();
|
|
|
+ await acceptPromise;
|
|
|
+ await updatePromise;
|
|
|
+ await promiseServiceWorkersCleared();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test clearing service wroker through the settings panel
|
|
|
+ add_task(async function() {
|
|
|
+ // Register a test service worker
|
|
|
+ await loadServiceWorkerTestPage(TEST_SERVICE_WORKER_URL);
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
|
|
|
+ // Test the initial states
|
|
|
+@@ -144,17 +144,17 @@ add_task(async function() {
|
|
|
+ } else {
|
|
|
+ ok(false, `Should have one site of ${host}`);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ await acceptRemovePromise;
|
|
|
+ await updatePromise;
|
|
|
+ await promiseServiceWorkersCleared();
|
|
|
+ await SiteDataManager.removeAll();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test showing and removing sites with cookies.
|
|
|
+ add_task(async function() {
|
|
|
+ // Add some test cookies.
|
|
|
+ let uri = Services.io.newURI("https://example.com");
|
|
|
+ let uri2 = Services.io.newURI("https://example.org");
|
|
|
+ Services.cookies.add(uri.host, uri.path, "test1", "1",
|
|
|
+@@ -252,11 +252,11 @@ add_task(async function() {
|
|
|
+
|
|
|
+ ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
|
|
|
+ let frameDoc = content.gSubDialog._topDialog._frame.contentDocument;
|
|
|
+
|
|
|
+ let siteItems = frameDoc.getElementsByTagName("richlistitem");
|
|
|
+ is(siteItems.length, 0, "Should list no sites with cookies");
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/siteData/browser_siteData2.js b/browser/components/preferences/in-content-new/tests/siteData/browser_siteData2.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/siteData/browser_siteData2.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/siteData/browser_siteData2.js
|
|
|
+@@ -89,17 +89,17 @@ add_task(async function() {
|
|
|
+ saveBtn.doCommand();
|
|
|
+ await acceptPromise;
|
|
|
+ await settingsDialogClosePromise;
|
|
|
+ await updatePromise;
|
|
|
+ await openSiteDataSettingsDialog();
|
|
|
+ assertAllSitesNotListed(win);
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ function removeAllSitesOneByOne() {
|
|
|
+ frameDoc = win.gSubDialog._topDialog._frame.contentDocument;
|
|
|
+ let removeBtn = frameDoc.getElementById("removeSelected");
|
|
|
+ let sitesList = frameDoc.getElementById("sitesList");
|
|
|
+ let sites = sitesList.getElementsByTagName("richlistitem");
|
|
|
+ for (let i = sites.length - 1; i >= 0; --i) {
|
|
|
+ sites[i].click();
|
|
|
+@@ -200,17 +200,17 @@ add_task(async function() {
|
|
|
+ assertSitesListed(doc, fakeHosts.slice(2));
|
|
|
+ saveBtn.doCommand();
|
|
|
+ await removeDialogOpenPromise;
|
|
|
+ await settingsDialogClosePromise;
|
|
|
+ await openSiteDataSettingsDialog();
|
|
|
+ assertSitesListed(doc, fakeHosts.slice(2));
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ function removeSelectedSite(hosts) {
|
|
|
+ frameDoc = win.gSubDialog._topDialog._frame.contentDocument;
|
|
|
+ let removeBtn = frameDoc.getElementById("removeSelected");
|
|
|
+ is(removeBtn.disabled, true, "Should start with disabled removeSelected button");
|
|
|
+ let sitesList = frameDoc.getElementById("sitesList");
|
|
|
+ hosts.forEach(host => {
|
|
|
+ let site = sitesList.querySelector(`richlistitem[host="${host}"]`);
|
|
|
+@@ -277,17 +277,17 @@ add_task(async function() {
|
|
|
+ saveBtn.doCommand();
|
|
|
+ await acceptRemovePromise;
|
|
|
+ await settingsDialogClosePromise;
|
|
|
+ await updatePromise;
|
|
|
+ await openSiteDataSettingsDialog();
|
|
|
+ assertSitesListed(doc, fakeHosts.filter(host => !host.includes("xyz")));
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test dynamically clearing all site data
|
|
|
+ add_task(async function() {
|
|
|
+ mockSiteDataManager.register(SiteDataManager, [
|
|
|
+ {
|
|
|
+ usage: 1024,
|
|
|
+ origin: "https://account.xyz.com",
|
|
|
+@@ -334,10 +334,10 @@ add_task(async function() {
|
|
|
+ saveBtn.doCommand();
|
|
|
+ await acceptRemovePromise;
|
|
|
+ await settingsDialogClosePromise;
|
|
|
+ await updatePromise;
|
|
|
+ await openSiteDataSettingsDialog();
|
|
|
+ assertAllSitesNotListed(win);
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/siteData/browser_siteData3.js b/browser/components/preferences/in-content-new/tests/siteData/browser_siteData3.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/siteData/browser_siteData3.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/siteData/browser_siteData3.js
|
|
|
+@@ -35,17 +35,17 @@ add_task(async function() {
|
|
|
+ let updatePromise = promiseSiteDataManagerSitesUpdated();
|
|
|
+ let doc = gBrowser.selectedBrowser.contentDocument;
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
|
|
|
+ await updatePromise;
|
|
|
+ await openSiteDataSettingsDialog();
|
|
|
+ assertSitesListed(doc, fakeHosts.filter(host => host != "shopping.xyz.com"));
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test grouping and listing sites across scheme, port and origin attributes by host
|
|
|
+ add_task(async function() {
|
|
|
+ const quotaUsage = 1024;
|
|
|
+ mockSiteDataManager.register(SiteDataManager, [
|
|
|
+ {
|
|
|
+ usage: quotaUsage,
|
|
|
+@@ -92,17 +92,17 @@ add_task(async function() {
|
|
|
+ is(columns[1].value, "5", "Should group cookies across scheme, port and origin attributes");
|
|
|
+
|
|
|
+ let prefStrBundle = frameDoc.getElementById("bundlePreferences");
|
|
|
+ expected = prefStrBundle.getFormattedString("siteUsagePersistent",
|
|
|
+ DownloadUtils.convertByteUnits(quotaUsage * mockSiteDataManager.fakeSites.length));
|
|
|
+ is(columns[2].value, expected, "Should sum up usages across scheme, port, origin attributes and persistent status");
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test sorting
|
|
|
+ add_task(async function() {
|
|
|
+ mockSiteDataManager.register(SiteDataManager, [
|
|
|
+ {
|
|
|
+ usage: 1024,
|
|
|
+ origin: "https://account.xyz.com",
|
|
|
+@@ -153,17 +153,17 @@ add_task(async function() {
|
|
|
+
|
|
|
+ // Test sorting on the cookies column
|
|
|
+ cookiesCol.click();
|
|
|
+ assertSortByCookies("ascending");
|
|
|
+ cookiesCol.click();
|
|
|
+ assertSortByCookies("descending");
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ function assertSortByBaseDomain(order) {
|
|
|
+ let siteItems = sitesList.getElementsByTagName("richlistitem");
|
|
|
+ for (let i = 0; i < siteItems.length - 1; ++i) {
|
|
|
+ let aHost = siteItems[i].getAttribute("host");
|
|
|
+ let bHost = siteItems[i + 1].getAttribute("host");
|
|
|
+ let a = findSiteByHost(aHost);
|
|
|
+ let b = findSiteByHost(bHost);
|
|
|
+@@ -251,17 +251,17 @@ add_task(async function() {
|
|
|
+
|
|
|
+ // Test sorting on the date column
|
|
|
+ lastAccessedCol.click();
|
|
|
+ assertSortByDate("ascending");
|
|
|
+ lastAccessedCol.click();
|
|
|
+ assertSortByDate("descending");
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ function assertSortByDate(order) {
|
|
|
+ let siteItems = sitesList.getElementsByTagName("richlistitem");
|
|
|
+ for (let i = 0; i < siteItems.length - 1; ++i) {
|
|
|
+ let aHost = siteItems[i].getAttribute("host");
|
|
|
+ let bHost = siteItems[i + 1].getAttribute("host");
|
|
|
+ let a = findSiteByHost(aHost);
|
|
|
+ let b = findSiteByHost(bHost);
|
|
|
+diff --git a/browser/components/preferences/in-content-new/tests/siteData/head.js b/browser/components/preferences/in-content-new/tests/siteData/head.js
|
|
|
+--- a/browser/components/preferences/in-content-new/tests/siteData/head.js
|
|
|
++++ b/browser/components/preferences/in-content-new/tests/siteData/head.js
|
|
|
+@@ -235,17 +235,17 @@ function promiseCookiesCleared() {
|
|
|
+ }
|
|
|
+
|
|
|
+ async function loadServiceWorkerTestPage(url) {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, url);
|
|
|
+ await BrowserTestUtils.waitForCondition(() => {
|
|
|
+ return ContentTask.spawn(tab.linkedBrowser, {}, () =>
|
|
|
+ content.document.body.getAttribute("data-test-service-worker-registered") === "true");
|
|
|
+ }, `Fail to load service worker test ${url}`);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ function promiseServiceWorkersCleared() {
|
|
|
+ return BrowserTestUtils.waitForCondition(() => {
|
|
|
+ let serviceWorkers = serviceWorkerManager.getAllRegistrations();
|
|
|
+ if (serviceWorkers.length == 0) {
|
|
|
+ ok(true, "Cleared all service workers");
|
|
|
+ return true;
|
|
|
+diff --git a/browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js b/browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js
|
|
|
+--- a/browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js
|
|
|
++++ b/browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js
|
|
|
+@@ -10,11 +10,11 @@ add_task(async function() {
|
|
|
+ let useCurrent = doc.getElementById("useCurrent");
|
|
|
+ useCurrent.click();
|
|
|
+
|
|
|
+ is(gBrowser.tabs.length, 3, "Three tabs should be open");
|
|
|
+ is(Services.prefs.getCharPref("browser.startup.homepage"), "about:blank|about:home",
|
|
|
+ "about:blank and about:home should be the only homepages set");
|
|
|
+
|
|
|
+ Services.prefs.setCharPref("browser.startup.homepage", oldHomepagePref);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content/tests/browser_performance.js b/browser/components/preferences/in-content/tests/browser_performance.js
|
|
|
+--- a/browser/components/preferences/in-content/tests/browser_performance.js
|
|
|
++++ b/browser/components/preferences/in-content/tests/browser_performance.js
|
|
|
+@@ -147,10 +147,10 @@ add_task(async function() {
|
|
|
+ is(performanceSettings.hidden, false, "performance settings section should be shown");
|
|
|
+
|
|
|
+ let allowHWAccel = doc.querySelector("#allowHWAccel");
|
|
|
+ is(Services.prefs.getBoolPref("layers.acceleration.disabled"), true,
|
|
|
+ "pref value is false");
|
|
|
+ ok(!allowHWAccel.checked, "checkbox should not be checked");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content/tests/browser_performance_e10srollout.js b/browser/components/preferences/in-content/tests/browser_performance_e10srollout.js
|
|
|
+--- a/browser/components/preferences/in-content/tests/browser_performance_e10srollout.js
|
|
|
++++ b/browser/components/preferences/in-content/tests/browser_performance_e10srollout.js
|
|
|
+@@ -32,17 +32,17 @@ add_task(async function testPrefsAreDefa
|
|
|
+ "pref value should be false after clicking on checkbox");
|
|
|
+ ok(!useRecommendedPerformanceSettings.checked, "checkbox should not be checked after clicking on checkbox");
|
|
|
+
|
|
|
+ let contentProcessCount = doc.querySelector("#contentProcessCount");
|
|
|
+ is(contentProcessCount.disabled, false, "process count control should be enabled");
|
|
|
+ is(Services.prefs.getIntPref("dom.ipc.processCount"), DEFAULT_PROCESS_COUNT, "default pref should be default value");
|
|
|
+ is(contentProcessCount.selectedItem.value, DEFAULT_PROCESS_COUNT, "selected item should be the default one");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ Services.prefs.clearUserPref("dom.ipc.processCount");
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function testPrefsSetByUser() {
|
|
|
+ Services.prefs.setIntPref("dom.ipc.processCount", DEFAULT_PROCESS_COUNT + 2);
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", false);
|
|
|
+@@ -62,13 +62,13 @@ add_task(async function testPrefsSetByUs
|
|
|
+ let useRecommendedPerformanceSettings = doc.querySelector("#useRecommendedPerformanceSettings");
|
|
|
+ useRecommendedPerformanceSettings.click();
|
|
|
+
|
|
|
+ is(Services.prefs.getBoolPref("browser.preferences.defaultPerformanceSettings.enabled"), true,
|
|
|
+ "pref value should be true after clicking on checkbox");
|
|
|
+ is(Services.prefs.getIntPref("dom.ipc.processCount"), DEFAULT_PROCESS_COUNT,
|
|
|
+ "process count should be default value");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ Services.prefs.clearUserPref("dom.ipc.processCount");
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content/tests/browser_performance_non_e10s.js b/browser/components/preferences/in-content/tests/browser_performance_non_e10s.js
|
|
|
+--- a/browser/components/preferences/in-content/tests/browser_performance_non_e10s.js
|
|
|
++++ b/browser/components/preferences/in-content/tests/browser_performance_non_e10s.js
|
|
|
+@@ -54,34 +54,34 @@ add_task(async function() {
|
|
|
+ allowHWAccelPref = Services.prefs.getBoolPref("layers.acceleration.disabled");
|
|
|
+ is(allowHWAccelPref, DEFAULT_HW_ACCEL_PREF,
|
|
|
+ "pref value should be the default value after clicking on checkbox");
|
|
|
+ is(allowHWAccel.checked, !allowHWAccelPref, "checkbox should show the invert of the current value");
|
|
|
+
|
|
|
+ is(performanceSettings.hidden, false, "performance settings section should be still shown");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ let prefs = await openPreferencesViaOpenPreferencesAPI("paneGeneral", null, {leaveOpen: true});
|
|
|
+ is(prefs.selectedPane, "paneGeneral", "General pane was selected");
|
|
|
+
|
|
|
+ let doc = gBrowser.contentDocument;
|
|
|
+ let performanceSettings = doc.querySelector("#performanceSettings");
|
|
|
+
|
|
|
+ is(performanceSettings.hidden, true, "performance settings section should not be shown");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", false);
|
|
|
+
|
|
|
+ is(performanceSettings.hidden, false, "performance settings section should be shown");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ Services.prefs.setBoolPref("layers.acceleration.disabled", true);
|
|
|
+
|
|
|
+ let prefs = await openPreferencesViaOpenPreferencesAPI("paneGeneral", null, {leaveOpen: true});
|
|
|
+ is(prefs.selectedPane, "paneGeneral", "General pane was selected");
|
|
|
+
|
|
|
+@@ -91,10 +91,10 @@ add_task(async function() {
|
|
|
+ is(performanceSettings.hidden, false, "performance settings section should be shown");
|
|
|
+
|
|
|
+ let allowHWAccel = doc.querySelector("#allowHWAccel");
|
|
|
+ is(Services.prefs.getBoolPref("layers.acceleration.disabled"), true,
|
|
|
+ "pref value is false");
|
|
|
+ ok(!allowHWAccel.checked, "checkbox should not be checked");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content/tests/privacypane_tests_perwindow.js b/browser/components/preferences/in-content/tests/privacypane_tests_perwindow.js
|
|
|
+--- a/browser/components/preferences/in-content/tests/privacypane_tests_perwindow.js
|
|
|
++++ b/browser/components/preferences/in-content/tests/privacypane_tests_perwindow.js
|
|
|
+@@ -4,17 +4,17 @@
|
|
|
+ async function runTestOnPrivacyPrefPane(testFunc) {
|
|
|
+ info("runTestOnPrivacyPrefPane entered");
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:preferences", true, true);
|
|
|
+ let browser = tab.linkedBrowser;
|
|
|
+ info("loaded about:preferences");
|
|
|
+ browser.contentWindow.gotoPref("panePrivacy");
|
|
|
+ info("viewing privacy pane, executing testFunc");
|
|
|
+ testFunc(browser.contentWindow);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ function controlChanged(element) {
|
|
|
+ element.doCommand();
|
|
|
+ }
|
|
|
+
|
|
|
+ // We can only test the panes that don't trigger a preference update
|
|
|
+ function test_pane_visibility(win) {
|
|
|
+diff --git a/browser/components/preferences/in-content/tests/siteData/browser_clearSiteData.js b/browser/components/preferences/in-content/tests/siteData/browser_clearSiteData.js
|
|
|
+--- a/browser/components/preferences/in-content/tests/siteData/browser_clearSiteData.js
|
|
|
++++ b/browser/components/preferences/in-content/tests/siteData/browser_clearSiteData.js
|
|
|
+@@ -6,26 +6,26 @@
|
|
|
+ ChromeUtils.import("resource:///modules/SitePermissions.jsm");
|
|
|
+
|
|
|
+ async function testClearData(clearSiteData, clearCache) {
|
|
|
+ let quotaURI = Services.io.newURI(TEST_QUOTA_USAGE_ORIGIN);
|
|
|
+ SitePermissions.set(quotaURI, "persistent-storage", SitePermissions.ALLOW);
|
|
|
+
|
|
|
+ // Open a test site which saves into appcache.
|
|
|
+ await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_OFFLINE_URL);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ // Fill indexedDB with test data.
|
|
|
+ // Don't wait for the page to load, to register the content event handler as quickly as possible.
|
|
|
+ // If this test goes intermittent, we might have to tell the page to wait longer before
|
|
|
+ // firing the event.
|
|
|
+ BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_QUOTA_USAGE_URL, false);
|
|
|
+ await BrowserTestUtils.waitForContentEvent(
|
|
|
+ gBrowser.selectedBrowser, "test-indexedDB-done", false, null, true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ // Register some service workers.
|
|
|
+ await loadServiceWorkerTestPage(TEST_SERVICE_WORKER_URL);
|
|
|
+ await promiseServiceWorkerRegisteredFor(TEST_SERVICE_WORKER_URL);
|
|
|
+
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("advanced", "networkTab", { leaveOpen: true });
|
|
|
+
|
|
|
+ // Test the initial states.
|
|
|
+@@ -141,17 +141,17 @@ async function testClearData(clearSiteDa
|
|
|
+ () => sizeLabel.textContent != opts.initialSizeLabelValue, "Site data size label should have updated.");
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ let desiredPermissionState = clearSiteData ? SitePermissions.UNKNOWN : SitePermissions.ALLOW;
|
|
|
+ let permission = SitePermissions.get(quotaURI, "persistent-storage");
|
|
|
+ is(permission.state, desiredPermissionState, "Should have the correct permission state.");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ await SiteDataManager.removeAll();
|
|
|
+ }
|
|
|
+
|
|
|
+ // Test opening the "Clear All Data" dialog and cancelling.
|
|
|
+ add_task(async function() {
|
|
|
+ await testClearData(false, false);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/components/preferences/in-content/tests/siteData/browser_siteData.js b/browser/components/preferences/in-content/tests/siteData/browser_siteData.js
|
|
|
+--- a/browser/components/preferences/in-content/tests/siteData/browser_siteData.js
|
|
|
++++ b/browser/components/preferences/in-content/tests/siteData/browser_siteData.js
|
|
|
+@@ -9,23 +9,23 @@ function getPersistentStoragePermStatus(
|
|
|
+ return Services.perms.testExactPermissionFromPrincipal(principal, "persistent-storage");
|
|
|
+ }
|
|
|
+
|
|
|
+ // Test listing site using quota usage or site using appcache
|
|
|
+ // This is currently disabled because of bug 1414751.
|
|
|
+ add_task(async function() {
|
|
|
+ // Open a test site which would save into appcache
|
|
|
+ await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_OFFLINE_URL);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ // Open a test site which would save into quota manager
|
|
|
+ BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_QUOTA_USAGE_URL);
|
|
|
+ await BrowserTestUtils.waitForContentEvent(
|
|
|
+ gBrowser.selectedBrowser, "test-indexedDB-done", false, null, true);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ let updatedPromise = promiseSitesUpdated();
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("advanced", "networkTab", { leaveOpen: true });
|
|
|
+ await updatedPromise;
|
|
|
+ await openSettingsDialog();
|
|
|
+ let dialogFrame = content.gSubDialog._topDialog._frame;
|
|
|
+ let frameDoc = dialogFrame.contentDocument;
|
|
|
+
|
|
|
+@@ -43,17 +43,17 @@ add_task(async function() {
|
|
|
+ await new Promise(resolve => {
|
|
|
+ let principal = Services.scriptSecurityManager
|
|
|
+ .createCodebasePrincipalFromOrigin(TEST_QUOTA_USAGE_ORIGIN);
|
|
|
+ let request = Services.qms.clearStoragesForPrincipal(principal, null, true);
|
|
|
+ request.callback = resolve;
|
|
|
+ });
|
|
|
+
|
|
|
+ await SiteDataManager.removeAll();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ }).skip(); // Bug 1414751
|
|
|
+
|
|
|
+ // Test buttons are disabled and loading message shown while updating sites
|
|
|
+ add_task(async function() {
|
|
|
+ let updatedPromise = promiseSitesUpdated();
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("advanced", "networkTab", { leaveOpen: true });
|
|
|
+ await updatedPromise;
|
|
|
+ let cacheSize = await SiteDataManager.getCacheSize();
|
|
|
+@@ -89,17 +89,17 @@ add_task(async function() {
|
|
|
+ await SiteDataManager.getTotalUsage()
|
|
|
+ .then(usage => {
|
|
|
+ actual = totalSiteDataSizeLabel.textContent;
|
|
|
+ expected = prefStrBundle.getFormattedString(
|
|
|
+ "totalSiteDataSize1", DownloadUtils.convertByteUnits(usage + cacheSize));
|
|
|
+ is(actual, expected, "Should show the right total site data size");
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test clearing service wroker through the "Clear All" button
|
|
|
+ add_task(async function() {
|
|
|
+ // Register a test service
|
|
|
+ await loadServiceWorkerTestPage(TEST_SERVICE_WORKER_URL);
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
|
|
|
+ // Test the initial states
|
|
|
+@@ -108,17 +108,17 @@ add_task(async function() {
|
|
|
+ let doc = gBrowser.selectedBrowser.contentDocument;
|
|
|
+ let clearBtn = doc.getElementById("clearSiteDataButton");
|
|
|
+ let acceptPromise = promiseAlertDialogOpen("accept");
|
|
|
+ let updatePromise = promiseSiteDataManagerSitesUpdated();
|
|
|
+ clearBtn.doCommand();
|
|
|
+ await acceptPromise;
|
|
|
+ await updatePromise;
|
|
|
+ await promiseServiceWorkersCleared();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test clearing service wroker through the settings panel
|
|
|
+ add_task(async function() {
|
|
|
+ // Register a test service worker
|
|
|
+ await loadServiceWorkerTestPage(TEST_SERVICE_WORKER_URL);
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("advanced", "networkTab", { leaveOpen: true });
|
|
|
+ // Test the initial states
|
|
|
+@@ -142,17 +142,17 @@ add_task(async function() {
|
|
|
+ } else {
|
|
|
+ ok(false, `Should have one site of ${host}`);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ await acceptRemovePromise;
|
|
|
+ await updatePromise;
|
|
|
+ await promiseServiceWorkersCleared();
|
|
|
+ await SiteDataManager.removeAll();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test showing and removing sites with cookies.
|
|
|
+ add_task(async function() {
|
|
|
+ // Add some test cookies.
|
|
|
+ let uri = Services.io.newURI("https://example.com");
|
|
|
+ let uri2 = Services.io.newURI("https://example.org");
|
|
|
+ Services.cookies.add(uri.host, uri.path, "test1", "1",
|
|
|
+@@ -250,10 +250,10 @@ add_task(async function() {
|
|
|
+
|
|
|
+ ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
|
|
|
+ let frameDoc = content.gSubDialog._topDialog._frame.contentDocument;
|
|
|
+
|
|
|
+ let siteItems = frameDoc.getElementsByTagName("richlistitem");
|
|
|
+ is(siteItems.length, 0, "Should list no sites with cookies");
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content/tests/siteData/browser_siteData2.js b/browser/components/preferences/in-content/tests/siteData/browser_siteData2.js
|
|
|
+--- a/browser/components/preferences/in-content/tests/siteData/browser_siteData2.js
|
|
|
++++ b/browser/components/preferences/in-content/tests/siteData/browser_siteData2.js
|
|
|
+@@ -89,17 +89,17 @@ add_task(async function() {
|
|
|
+ saveBtn.doCommand();
|
|
|
+ await acceptPromise;
|
|
|
+ await settingsDialogClosePromise;
|
|
|
+ await updatePromise;
|
|
|
+ await openSettingsDialog();
|
|
|
+ assertAllSitesNotListed(win);
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ function removeAllSitesOneByOne() {
|
|
|
+ frameDoc = win.gSubDialog._topDialog._frame.contentDocument;
|
|
|
+ let removeBtn = frameDoc.getElementById("removeSelected");
|
|
|
+ let sitesList = frameDoc.getElementById("sitesList");
|
|
|
+ let sites = sitesList.getElementsByTagName("richlistitem");
|
|
|
+ for (let i = sites.length - 1; i >= 0; --i) {
|
|
|
+ sites[i].click();
|
|
|
+@@ -200,17 +200,17 @@ add_task(async function() {
|
|
|
+ assertSitesListed(doc, fakeHosts.slice(2));
|
|
|
+ saveBtn.doCommand();
|
|
|
+ await removeDialogOpenPromise;
|
|
|
+ await settingsDialogClosePromise;
|
|
|
+ await openSettingsDialog();
|
|
|
+ assertSitesListed(doc, fakeHosts.slice(2));
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ function removeSelectedSite(hosts) {
|
|
|
+ frameDoc = win.gSubDialog._topDialog._frame.contentDocument;
|
|
|
+ let removeBtn = frameDoc.getElementById("removeSelected");
|
|
|
+ is(removeBtn.disabled, true, "Should start with disabled removeSelected button");
|
|
|
+ let sitesList = frameDoc.getElementById("sitesList");
|
|
|
+ hosts.forEach(host => {
|
|
|
+ let site = sitesList.querySelector(`richlistitem[host="${host}"]`);
|
|
|
+@@ -277,17 +277,17 @@ add_task(async function() {
|
|
|
+ saveBtn.doCommand();
|
|
|
+ await acceptRemovePromise;
|
|
|
+ await settingsDialogClosePromise;
|
|
|
+ await updatePromise;
|
|
|
+ await openSettingsDialog();
|
|
|
+ assertSitesListed(doc, fakeHosts.filter(host => !host.includes("xyz")));
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test dynamically clearing all site data
|
|
|
+ add_task(async function() {
|
|
|
+ mockSiteDataManager.register([
|
|
|
+ {
|
|
|
+ usage: 1024,
|
|
|
+ origin: "https://account.xyz.com",
|
|
|
+@@ -334,10 +334,10 @@ add_task(async function() {
|
|
|
+ saveBtn.doCommand();
|
|
|
+ await acceptRemovePromise;
|
|
|
+ await settingsDialogClosePromise;
|
|
|
+ await updatePromise;
|
|
|
+ await openSettingsDialog();
|
|
|
+ assertAllSitesNotListed(win);
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/preferences/in-content/tests/siteData/browser_siteData3.js b/browser/components/preferences/in-content/tests/siteData/browser_siteData3.js
|
|
|
+--- a/browser/components/preferences/in-content/tests/siteData/browser_siteData3.js
|
|
|
++++ b/browser/components/preferences/in-content/tests/siteData/browser_siteData3.js
|
|
|
+@@ -44,17 +44,17 @@ add_task(async function() {
|
|
|
+ searchBox.doCommand();
|
|
|
+ assertSitesListed(doc, fakeHosts.filter(host => host.includes("bar")));
|
|
|
+
|
|
|
+ searchBox.value = "";
|
|
|
+ searchBox.doCommand();
|
|
|
+ assertSitesListed(doc, fakeHosts);
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test not displaying sites which store 0 byte and don't have persistent storage.
|
|
|
+ add_task(async function() {
|
|
|
+ mockSiteDataManager.register([
|
|
|
+ {
|
|
|
+ usage: 0,
|
|
|
+ origin: "https://account.xyz.com",
|
|
|
+@@ -87,17 +87,17 @@ add_task(async function() {
|
|
|
+ let updatePromise = promiseSitesUpdated();
|
|
|
+ let doc = gBrowser.selectedBrowser.contentDocument;
|
|
|
+ await openPreferencesViaOpenPreferencesAPI("advanced", "networkTab", { leaveOpen: true });
|
|
|
+ await updatePromise;
|
|
|
+ await openSettingsDialog();
|
|
|
+ assertSitesListed(doc, fakeHosts.filter(host => host != "shopping.xyz.com"));
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test sorting
|
|
|
+ add_task(async function() {
|
|
|
+ mockSiteDataManager.register([
|
|
|
+ {
|
|
|
+ usage: 1024,
|
|
|
+ origin: "https://account.xyz.com",
|
|
|
+@@ -148,17 +148,17 @@ add_task(async function() {
|
|
|
+
|
|
|
+ // Test sorting on the cookies column
|
|
|
+ cookiesCol.click();
|
|
|
+ assertSortByCookies("ascending");
|
|
|
+ cookiesCol.click();
|
|
|
+ assertSortByCookies("descending");
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ function assertSortByBaseDomain(order) {
|
|
|
+ let siteItems = sitesList.getElementsByTagName("richlistitem");
|
|
|
+ for (let i = 0; i < siteItems.length - 1; ++i) {
|
|
|
+ let aHost = siteItems[i].getAttribute("host");
|
|
|
+ let bHost = siteItems[i + 1].getAttribute("host");
|
|
|
+ let a = findSiteByHost(aHost);
|
|
|
+ let b = findSiteByHost(bHost);
|
|
|
+@@ -246,17 +246,17 @@ add_task(async function() {
|
|
|
+
|
|
|
+ // Test sorting on the date column
|
|
|
+ lastAccessedCol.click();
|
|
|
+ assertSortByDate("ascending");
|
|
|
+ lastAccessedCol.click();
|
|
|
+ assertSortByDate("descending");
|
|
|
+
|
|
|
+ await mockSiteDataManager.unregister();
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ function assertSortByDate(order) {
|
|
|
+ let siteItems = sitesList.getElementsByTagName("richlistitem");
|
|
|
+ for (let i = 0; i < siteItems.length - 1; ++i) {
|
|
|
+ let aHost = siteItems[i].getAttribute("host");
|
|
|
+ let bHost = siteItems[i + 1].getAttribute("host");
|
|
|
+ let a = findSiteByHost(aHost);
|
|
|
+ let b = findSiteByHost(bHost);
|
|
|
+diff --git a/browser/components/preferences/in-content/tests/siteData/head.js b/browser/components/preferences/in-content/tests/siteData/head.js
|
|
|
+--- a/browser/components/preferences/in-content/tests/siteData/head.js
|
|
|
++++ b/browser/components/preferences/in-content/tests/siteData/head.js
|
|
|
+@@ -238,17 +238,17 @@ function promiseCookiesCleared() {
|
|
|
+ }
|
|
|
+
|
|
|
+ async function loadServiceWorkerTestPage(url) {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, url);
|
|
|
+ await BrowserTestUtils.waitForCondition(() => {
|
|
|
+ return ContentTask.spawn(tab.linkedBrowser, {}, () =>
|
|
|
+ content.document.body.getAttribute("data-test-service-worker-registered") === "true");
|
|
|
+ }, `Fail to load service worker test ${url}`);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ function promiseServiceWorkersCleared() {
|
|
|
+ return BrowserTestUtils.waitForCondition(() => {
|
|
|
+ let serviceWorkers = serviceWorkerManager.getAllRegistrations();
|
|
|
+ if (serviceWorkers.length == 0) {
|
|
|
+ ok(true, "Cleared all service workers");
|
|
|
+ return true;
|
|
|
+diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js
|
|
|
+--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js
|
|
|
++++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js
|
|
|
+@@ -18,17 +18,17 @@ async function openAboutPrivateBrowsing(
|
|
|
+ */
|
|
|
+ async function testLinkOpensTab({ win, tab, elementId, expectedUrl }) {
|
|
|
+ let newTabPromise = BrowserTestUtils.waitForNewTab(win.gBrowser, expectedUrl);
|
|
|
+ await ContentTask.spawn(tab, elementId, async function(elemId) {
|
|
|
+ content.document.getElementById(elemId).click();
|
|
|
+ });
|
|
|
+ let newTab = await newTabPromise;
|
|
|
+ ok(true, `Clicking ${elementId} opened ${expectedUrl} in a new tab.`);
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Clicks the given link and checks this opens the given URI in the same tab.
|
|
|
+ *
|
|
|
+ * This function does not return to the previous page.
|
|
|
+ */
|
|
|
+ async function testLinkOpensUrl({ win, tab, elementId, expectedUrl }) {
|
|
|
+diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_newtab_from_popup.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_newtab_from_popup.js
|
|
|
+--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_newtab_from_popup.js
|
|
|
++++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_newtab_from_popup.js
|
|
|
+@@ -54,12 +54,12 @@ add_task(async function test_private_pop
|
|
|
+ await BrowserTestUtils.synthesizeMouseAtCenter("#second", {}, popupBrowser);
|
|
|
+ let newPrivTab = await newTabPromise;
|
|
|
+
|
|
|
+ // Ensure that the newly created tab's browser is private.
|
|
|
+ ok(PrivateBrowsingUtils.isBrowserPrivate(newPrivTab.linkedBrowser),
|
|
|
+ "Newly opened tab should be private.");
|
|
|
+
|
|
|
+ // Clean up
|
|
|
+- await BrowserTestUtils.removeTab(newPrivTab);
|
|
|
++ BrowserTestUtils.removeTab(newPrivTab);
|
|
|
+ await BrowserTestUtils.closeWindow(popupWin);
|
|
|
+ await BrowserTestUtils.closeWindow(privWin);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placesTitleNoUpdate.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placesTitleNoUpdate.js
|
|
|
+--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placesTitleNoUpdate.js
|
|
|
++++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placesTitleNoUpdate.js
|
|
|
+@@ -13,17 +13,17 @@ add_task(async function test() {
|
|
|
+ const TITLE_2 = "Title 2";
|
|
|
+
|
|
|
+ await PlacesUtils.history.clear();
|
|
|
+
|
|
|
+ let promiseTitleChanged = PlacesTestUtils.waitForNotification(
|
|
|
+ "onTitleChanged", (uri, title) => uri.spec == TEST_URL, "history");
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
|
|
|
+ registerCleanupFunction(async () => {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ info("Wait for a title change notification.");
|
|
|
+ await promiseTitleChanged;
|
|
|
+ await BrowserTestUtils.waitForCondition(async function() {
|
|
|
+ let entry = await PlacesUtils.history.fetch(TEST_URL);
|
|
|
+ return entry && entry.title == TITLE_1;
|
|
|
+ }, "The title matches the original title after first visit");
|
|
|
+
|
|
|
+diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoom.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoom.js
|
|
|
+--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoom.js
|
|
|
++++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoom.js
|
|
|
+@@ -25,13 +25,13 @@ add_task(async function test() {
|
|
|
+ await BrowserTestUtils.switchTab(win.gBrowser, tabMozilla);
|
|
|
+
|
|
|
+ // make sure the zoom level has not changed
|
|
|
+ is(win.ZoomManager.zoom, mozillaZoom,
|
|
|
+ "Entering private browsing should not reset the zoom on a tab");
|
|
|
+
|
|
|
+ // cleanup
|
|
|
+ win.FullZoom.reset();
|
|
|
+- await Promise.all([ BrowserTestUtils.removeTab(tabMozilla),
|
|
|
+- BrowserTestUtils.removeTab(tabAbout) ]);
|
|
|
++ BrowserTestUtils.removeTab(tabMozilla);
|
|
|
++ BrowserTestUtils.removeTab(tabAbout);
|
|
|
+
|
|
|
+ await BrowserTestUtils.closeWindow(win);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/resistfingerprinting/test/browser/browser_block_mozAddonManager.js b/browser/components/resistfingerprinting/test/browser/browser_block_mozAddonManager.js
|
|
|
+--- a/browser/components/resistfingerprinting/test/browser/browser_block_mozAddonManager.js
|
|
|
++++ b/browser/components/resistfingerprinting/test/browser/browser_block_mozAddonManager.js
|
|
|
+@@ -24,12 +24,12 @@ add_task(async function test() {
|
|
|
+ is(content.navigator.mozAddonManager, undefined,
|
|
|
+ "The navigator.mozAddonManager should not exist when the pref is on.");
|
|
|
+ } else {
|
|
|
+ ok(content.navigator.mozAddonManager,
|
|
|
+ "The navigator.mozAddonManager should exist when the pref is off.");
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await SpecialPowers.popPrefEnv();
|
|
|
+ }
|
|
|
+ });
|
|
|
+diff --git a/browser/components/resistfingerprinting/test/browser/browser_bug1369357_site_specific_zoom_level.js b/browser/components/resistfingerprinting/test/browser/browser_bug1369357_site_specific_zoom_level.js
|
|
|
+--- a/browser/components/resistfingerprinting/test/browser/browser_bug1369357_site_specific_zoom_level.js
|
|
|
++++ b/browser/components/resistfingerprinting/test/browser/browser_bug1369357_site_specific_zoom_level.js
|
|
|
+@@ -20,12 +20,12 @@ add_task(async function() {
|
|
|
+ ]
|
|
|
+ });
|
|
|
+
|
|
|
+ tab3 = await BrowserTestUtils.openNewForegroundTab(gBrowser, testPage);
|
|
|
+ tab3Zoom = ZoomManager.getZoomForBrowser(tab3.linkedBrowser);
|
|
|
+
|
|
|
+ isnot(tab3Zoom, tab1Zoom, "privacy.resistFingerprinting is true, site-specific zoom level should be disabled");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
+- await BrowserTestUtils.removeTab(tab3);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab3);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/resistfingerprinting/test/browser/browser_navigator.js b/browser/components/resistfingerprinting/test/browser/browser_navigator.js
|
|
|
+--- a/browser/components/resistfingerprinting/test/browser/browser_navigator.js
|
|
|
++++ b/browser/components/resistfingerprinting/test/browser/browser_navigator.js
|
|
|
+@@ -74,17 +74,17 @@ async function testNavigator() {
|
|
|
+ is(result.hardwareConcurrency, SPOOFED_HW_CONCURRENCY, "Navigator.hardwareConcurrency is correctly spoofed.");
|
|
|
+
|
|
|
+ is(result.appCodeName, CONST_APPCODENAME, "Navigator.appCodeName reports correct constant value.");
|
|
|
+ is(result.product, CONST_PRODUCT, "Navigator.product reports correct constant value.");
|
|
|
+ is(result.productSub, CONST_PRODUCTSUB, "Navigator.productSub reports correct constant value.");
|
|
|
+ is(result.vendor, CONST_VENDOR, "Navigator.vendor reports correct constant value.");
|
|
|
+ is(result.vendorSub, CONST_VENDORSUB, "Navigator.vendorSub reports correct constant value.");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ async function testWorkerNavigator() {
|
|
|
+ // Open a tab to collect result from worker.
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(
|
|
|
+ gBrowser, TEST_PATH + "file_dummy.html");
|
|
|
+
|
|
|
+ let result = await ContentTask.spawn(tab.linkedBrowser, null, async function() {
|
|
|
+@@ -105,17 +105,17 @@ async function testWorkerNavigator() {
|
|
|
+ is(result.appVersion, SPOOFED_APPVERSION[AppConstants.platform], "Navigator.appVersion is correctly spoofed.");
|
|
|
+ is(result.platform, SPOOFED_PLATFORM[AppConstants.platform], "Navigator.platform is correctly spoofed.");
|
|
|
+ is(result.userAgent, spoofedUserAgent, "Navigator.userAgent is correctly spoofed.");
|
|
|
+ is(result.hardwareConcurrency, SPOOFED_HW_CONCURRENCY, "Navigator.hardwareConcurrency is correctly spoofed.");
|
|
|
+
|
|
|
+ is(result.appCodeName, CONST_APPCODENAME, "Navigator.appCodeName reports correct constant value.");
|
|
|
+ is(result.product, CONST_PRODUCT, "Navigator.product reports correct constant value.");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function setup() {
|
|
|
+ await SpecialPowers.pushPrefEnv({"set":
|
|
|
+ [["privacy.resistFingerprinting", true]]
|
|
|
+ });
|
|
|
+
|
|
|
+ let appVersion = parseInt(Services.appinfo.version);
|
|
|
+diff --git a/browser/components/resistfingerprinting/test/browser/browser_netInfo.js b/browser/components/resistfingerprinting/test/browser/browser_netInfo.js
|
|
|
+--- a/browser/components/resistfingerprinting/test/browser/browser_netInfo.js
|
|
|
++++ b/browser/components/resistfingerprinting/test/browser/browser_netInfo.js
|
|
|
+@@ -13,17 +13,17 @@ async function testWindow() {
|
|
|
+ gBrowser, TEST_PATH + "file_dummy.html");
|
|
|
+
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, null, async function() {
|
|
|
+ ok("connection" in content.navigator, "navigator.connection should exist");
|
|
|
+
|
|
|
+ is(content.navigator.connection.type, "unknown", "The connection type is spoofed correctly");
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ async function testWorker() {
|
|
|
+ // Open a tab to test network information in a worker.
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(
|
|
|
+ gBrowser, TEST_PATH + "file_dummy.html");
|
|
|
+
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, null, async function() {
|
|
|
+@@ -40,17 +40,17 @@ async function testWorker() {
|
|
|
+ ok(false, "Unknown message type");
|
|
|
+ resolve();
|
|
|
+ }
|
|
|
+ };
|
|
|
+ worker.postMessage({type: "runTests"});
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function runTest() {
|
|
|
+ await SpecialPowers.pushPrefEnv({"set":
|
|
|
+ [
|
|
|
+ ["privacy.resistFingerprinting", true],
|
|
|
+ ["dom.netinfo.enabled", true]
|
|
|
+ ]
|
|
|
+diff --git a/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js b/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js
|
|
|
+--- a/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js
|
|
|
++++ b/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js
|
|
|
+@@ -112,17 +112,17 @@ add_task(async function runRPTests() {
|
|
|
+ is(content.performance.getEntriesByName("Test", "mark").length, 0, "For resistFingerprinting, there should be no entries for performance.getEntriesByName()");
|
|
|
+
|
|
|
+ };
|
|
|
+
|
|
|
+ await setupTest(tab, true, true, 100, runTests);
|
|
|
+ await setupTest(tab, true, false, 13, runTests);
|
|
|
+ await setupTest(tab, true, false, .13, runTests);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // ================================================================================================
|
|
|
+ // ================================================================================================
|
|
|
+ add_task(async function runRTPTests() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(
|
|
|
+ gBrowser, TEST_PATH + "file_dummy.html");
|
|
|
+
|
|
|
+@@ -160,17 +160,17 @@ add_task(async function runRTPTests() {
|
|
|
+ content.performance.clearMeasures();
|
|
|
+ content.performance.clearResourceTimings();
|
|
|
+ };
|
|
|
+
|
|
|
+ await setupTest(tab, false, true, 100, runTests);
|
|
|
+ await setupTest(tab, false, true, 13, runTests);
|
|
|
+ await setupTest(tab, false, true, .13, runTests);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // ================================================================================================
|
|
|
+ // ================================================================================================
|
|
|
+ let runWorkerTest = async function(data) {
|
|
|
+ let expectedPrecision = data.precision;
|
|
|
+ let workerCall = data.workerCall;
|
|
|
+ await new Promise(resolve => {
|
|
|
+@@ -194,21 +194,21 @@ let runWorkerTest = async function(data)
|
|
|
+ add_task(async function runRPTestsForWorker() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(
|
|
|
+ gBrowser, TEST_PATH + "file_dummy.html");
|
|
|
+
|
|
|
+ await setupTest(tab, true, true, 100, runWorkerTest, "runRPTests");
|
|
|
+ await setupTest(tab, true, false, 13, runWorkerTest, "runRPTests");
|
|
|
+ await setupTest(tab, true, true, .13, runWorkerTest, "runRPTests");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function runRTPTestsForWorker() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(
|
|
|
+ gBrowser, TEST_PATH + "file_dummy.html");
|
|
|
+
|
|
|
+ await setupTest(tab, false, true, 100, runWorkerTest, "runRTPTests");
|
|
|
+ await setupTest(tab, false, true, 13, runWorkerTest, "runRTPTests");
|
|
|
+ await setupTest(tab, false, true, .13, runWorkerTest, "runRTPTests");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_newWindow.js b/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_newWindow.js
|
|
|
+--- a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_newWindow.js
|
|
|
++++ b/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_newWindow.js
|
|
|
+@@ -39,11 +39,11 @@ add_task(async function test_new_window(
|
|
|
+ "The screen.height has a correct rounded value");
|
|
|
+ is(content.innerWidth, input.gMaxAvailWidth,
|
|
|
+ "The window.innerWidth has a correct rounded value");
|
|
|
+ is(content.innerHeight, input.gMaxAvailHeight,
|
|
|
+ "The window.innerHeight has a correct rounded value");
|
|
|
+ }
|
|
|
+ );
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await BrowserTestUtils.closeWindow(win);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/resistfingerprinting/test/browser/browser_spoofing_keyboard_event.js b/browser/components/resistfingerprinting/test/browser/browser_spoofing_keyboard_event.js
|
|
|
+--- a/browser/components/resistfingerprinting/test/browser/browser_spoofing_keyboard_event.js
|
|
|
++++ b/browser/components/resistfingerprinting/test/browser/browser_spoofing_keyboard_event.js
|
|
|
+@@ -745,17 +745,17 @@ add_task(async function runTestsForEngli
|
|
|
+ result: { key: "\u00DF", code: "", charCode: 223, keyCode: 0,
|
|
|
+ location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD, altKey: false, shiftKey: false,
|
|
|
+ ctrlKey: false, altGraphKey: false }
|
|
|
+ }
|
|
|
+ );
|
|
|
+
|
|
|
+ gBrowser.removeEventListener("keypress", eventConsumer, true);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function runTestForSuppressModifierKeys() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(
|
|
|
+ gBrowser, TEST_PATH + "file_keyBoardEvent.sjs?language=en-US");
|
|
|
+
|
|
|
+ // Prevent Alt key to trigger the menu item.
|
|
|
+ gBrowser.addEventListener("keydown", eventConsumer, true);
|
|
|
+@@ -805,11 +805,11 @@ add_task(async function runTestForSuppre
|
|
|
+ BrowserTestUtils.synthesizeKey("x", {}, tab.linkedBrowser);
|
|
|
+
|
|
|
+ await testPromise;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ gBrowser.removeEventListener("keydown", eventConsumer, true);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/components/resistfingerprinting/test/browser/browser_timezone.js b/browser/components/resistfingerprinting/test/browser/browser_timezone.js
|
|
|
+--- a/browser/components/resistfingerprinting/test/browser/browser_timezone.js
|
|
|
++++ b/browser/components/resistfingerprinting/test/browser/browser_timezone.js
|
|
|
+@@ -30,10 +30,10 @@ add_task(async function test_timezone()
|
|
|
+ is(dateObj.getDate(), dateObj.getUTCDate(), "The month reports in UTC timezone.");
|
|
|
+ is(dateObj.getDay(), dateObj.getUTCDay(), "The day reports in UTC timezone.");
|
|
|
+ is(dateObj.getHours(), dateObj.getUTCHours(), "The hours reports in UTC timezone.");
|
|
|
+ is(dateObj.getTimezoneOffset(), 0, "The difference with UTC timezone is 0.");
|
|
|
+
|
|
|
+ }
|
|
|
+ );
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/resistfingerprinting/test/browser/head.js b/browser/components/resistfingerprinting/test/browser/head.js
|
|
|
+--- a/browser/components/resistfingerprinting/test/browser/head.js
|
|
|
++++ b/browser/components/resistfingerprinting/test/browser/head.js
|
|
|
+@@ -29,17 +29,17 @@ async function calcMaximumAvailSize(aChr
|
|
|
+ return result;
|
|
|
+ });
|
|
|
+
|
|
|
+ // Calculate the maximum available window size which is depending on the
|
|
|
+ // available screen space.
|
|
|
+ chromeUIWidth = win.outerWidth - contentSize.width;
|
|
|
+ chromeUIHeight = win.outerHeight - contentSize.height;
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await BrowserTestUtils.closeWindow(win);
|
|
|
+ } else {
|
|
|
+ chromeUIWidth = aChromeWidth;
|
|
|
+ chromeUIHeight = aChromeHeight;
|
|
|
+ }
|
|
|
+
|
|
|
+ let availWidth = window.screen.availWidth;
|
|
|
+ let availHeight = window.screen.availHeight;
|
|
|
+@@ -86,17 +86,17 @@ async function calcPopUpWindowChromeUISi
|
|
|
+ chromeHeight: win.outerHeight - win.innerHeight
|
|
|
+ };
|
|
|
+
|
|
|
+ win.close();
|
|
|
+
|
|
|
+ return res;
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ async function testWindowOpen(aBrowser, aSettingWidth, aSettingHeight,
|
|
|
+ aTargetWidth, aTargetHeight, aTestOuter,
|
|
|
+ aMaxAvailWidth, aMaxAvailHeight, aPopupChromeUIWidth,
|
|
|
+ aPopupChromeUIHeight) {
|
|
|
+@@ -278,17 +278,17 @@ class RoundedWindowTest {
|
|
|
+ // Open a tab to test.
|
|
|
+ this.tab = await BrowserTestUtils.openNewForegroundTab(
|
|
|
+ gBrowser, this.TEST_PATH + "file_dummy.html");
|
|
|
+
|
|
|
+ for (let test of this.testCases) {
|
|
|
+ await this.doTest(test, testOuter);
|
|
|
+ }
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(this.tab);
|
|
|
++ BrowserTestUtils.removeTab(this.tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ async doTest() {
|
|
|
+ throw new Error("RoundedWindowTest.doTest must be overridden.");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ class WindowSettingTest extends RoundedWindowTest {
|
|
|
+diff --git a/browser/components/search/test/browser_google_behavior.js b/browser/components/search/test/browser_google_behavior.js
|
|
|
+--- a/browser/components/search/test/browser_google_behavior.js
|
|
|
++++ b/browser/components/search/test/browser_google_behavior.js
|
|
|
+@@ -167,10 +167,10 @@ async function testSearchEngine(engineDe
|
|
|
+ await test.run(tab);
|
|
|
+
|
|
|
+ let receivedURI = await stateChangePromise;
|
|
|
+
|
|
|
+ Assert.equal(receivedURI, test.searchURL);
|
|
|
+ }
|
|
|
+
|
|
|
+ engine.alias = undefined;
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+diff --git a/browser/components/search/test/browser_oneOffContextMenu.js b/browser/components/search/test/browser_oneOffContextMenu.js
|
|
|
+--- a/browser/components/search/test/browser_oneOffContextMenu.js
|
|
|
++++ b/browser/components/search/test/browser_oneOffContextMenu.js
|
|
|
+@@ -68,13 +68,13 @@ async function doTest() {
|
|
|
+ EventUtils.synthesizeKey("KEY_Escape");
|
|
|
+ await promise;
|
|
|
+
|
|
|
+ // Check the loaded tab.
|
|
|
+ Assert.equal(tab.linkedBrowser.currentURI.spec,
|
|
|
+ "http://mochi.test:8888/browser/browser/components/search/test/",
|
|
|
+ "Expected search tab should have loaded");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ // Move the cursor out of the panel area to avoid messing with other tests.
|
|
|
+ await EventUtils.synthesizeNativeMouseMove(searchbar);
|
|
|
+ }
|
|
|
+diff --git a/browser/components/search/test/browser_searchEngine_behaviors.js b/browser/components/search/test/browser_searchEngine_behaviors.js
|
|
|
+--- a/browser/components/search/test/browser_searchEngine_behaviors.js
|
|
|
++++ b/browser/components/search/test/browser_searchEngine_behaviors.js
|
|
|
+@@ -207,10 +207,10 @@ async function testSearchEngine(engineDe
|
|
|
+ await test.run(tab);
|
|
|
+
|
|
|
+ let receivedURI = await stateChangePromise;
|
|
|
+
|
|
|
+ Assert.equal(receivedURI, test.searchURL);
|
|
|
+ }
|
|
|
+
|
|
|
+ engine.alias = undefined;
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+diff --git a/browser/components/sessionstore/test/browser_480893.js b/browser/components/sessionstore/test/browser_480893.js
|
|
|
+--- a/browser/components/sessionstore/test/browser_480893.js
|
|
|
++++ b/browser/components/sessionstore/test/browser_480893.js
|
|
|
+@@ -38,10 +38,10 @@ add_task(async function() {
|
|
|
+ doc = browser.contentDocument;
|
|
|
+
|
|
|
+ // Click on the "Close" button after about:sessionrestore is loaded.
|
|
|
+ doc.getElementById("errorCancel").click();
|
|
|
+ await BrowserTestUtils.browserLoaded(browser);
|
|
|
+
|
|
|
+ is(browser.currentURI.spec, homepage, "loaded page is the homepage");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/sessionstore/test/browser_579879.js b/browser/components/sessionstore/test/browser_579879.js
|
|
|
+--- a/browser/components/sessionstore/test/browser_579879.js
|
|
|
++++ b/browser/components/sessionstore/test/browser_579879.js
|
|
|
+@@ -10,11 +10,11 @@ add_task(async function() {
|
|
|
+
|
|
|
+ is(Array.indexOf(gBrowser.tabs, tab1), 0, "pinned tab 1 is at the first position");
|
|
|
+ await promiseRemoveTabAndSessionState(tab1);
|
|
|
+
|
|
|
+ tab1 = undoCloseTab();
|
|
|
+ ok(tab1.pinned, "pinned tab 1 has been restored as a pinned tab");
|
|
|
+ is(Array.indexOf(gBrowser.tabs, tab1), 0, "pinned tab 1 has been restored to the first position");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/sessionstore/test/browser_615394-SSWindowState_events_undoCloseTab.js b/browser/components/sessionstore/test/browser_615394-SSWindowState_events_undoCloseTab.js
|
|
|
+--- a/browser/components/sessionstore/test/browser_615394-SSWindowState_events_undoCloseTab.js
|
|
|
++++ b/browser/components/sessionstore/test/browser_615394-SSWindowState_events_undoCloseTab.js
|
|
|
+@@ -48,10 +48,10 @@ add_task(async function test_undoCloseTa
|
|
|
+ Assert.equal(busyEventCount, 1);
|
|
|
+ Assert.equal(readyEventCount, 1);
|
|
|
+ Assert.equal(ss.getTabValue(reopenedTab, "baz"), "qux");
|
|
|
+ Assert.equal(reopenedTab.linkedBrowser.currentURI.spec, "about:rights");
|
|
|
+
|
|
|
+ window.removeEventListener("SSWindowStateBusy", onSSWindowStateBusy);
|
|
|
+ window.removeEventListener("SSWindowStateReady", onSSWindowStateReady);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(reopenedTab);
|
|
|
++ BrowserTestUtils.removeTab(reopenedTab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/sessionstore/test/browser_background_tab_crash.js b/browser/components/sessionstore/test/browser_background_tab_crash.js
|
|
|
+--- a/browser/components/sessionstore/test/browser_background_tab_crash.js
|
|
|
++++ b/browser/components/sessionstore/test/browser_background_tab_crash.js
|
|
|
+@@ -56,18 +56,18 @@ async function setupBackgroundTabs(testF
|
|
|
+ remoteBrowser2.frameLoader.childID,
|
|
|
+ "Both remote browsers should share the same content process.");
|
|
|
+
|
|
|
+ // Now switch back to the non-remote browser...
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, initialTab);
|
|
|
+
|
|
|
+ await testFn([tab1, tab2]);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Takes some set of background tabs that are assumed to all belong to
|
|
|
+ * the same content process, and crashes them.
|
|
|
+ *
|
|
|
+ * @param tabs (Array(<xul:tab>))
|
|
|
+ * The tabs to crash.
|
|
|
+diff --git a/browser/components/sessionstore/test/browser_docshell_uuid_consistency.js b/browser/components/sessionstore/test/browser_docshell_uuid_consistency.js
|
|
|
+--- a/browser/components/sessionstore/test/browser_docshell_uuid_consistency.js
|
|
|
++++ b/browser/components/sessionstore/test/browser_docshell_uuid_consistency.js
|
|
|
+@@ -18,18 +18,18 @@ add_task(async function duplicateTab() {
|
|
|
+ await ContentTask.spawn(tab2.linkedBrowser, null, function() {
|
|
|
+ let docshell = content.window.QueryInterface(Ci.nsIInterfaceRequestor)
|
|
|
+ .getInterface(Ci.nsIWebNavigation)
|
|
|
+ .QueryInterface(Ci.nsIDocShell);
|
|
|
+ let shEntry = docshell.sessionHistory.getEntryAtIndex(0, false);
|
|
|
+ is(shEntry.docshellID.toString(), docshell.historyID.toString());
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Second test - open a tab and navigate across processes, which triggers sessionrestore to persist history.
|
|
|
+ add_task(async function contentToChromeNavigate() {
|
|
|
+ const TEST_URL = "data:text/html,foo";
|
|
|
+ let tab = BrowserTestUtils.addTab(gBrowser, TEST_URL);
|
|
|
+ await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
|
|
|
+
|
|
|
+@@ -56,10 +56,10 @@ add_task(async function contentToChromeN
|
|
|
+
|
|
|
+ // 'cause we're in the chrome process, we can just directly poke at the shistory.
|
|
|
+ let sh = docShell.QueryInterface(Ci.nsIWebNavigation).sessionHistory;
|
|
|
+
|
|
|
+ is(sh.count, 2);
|
|
|
+ is(sh.getEntryAtIndex(0, false).docshellID.toString(), docShell.historyID.toString());
|
|
|
+ is(sh.getEntryAtIndex(1, false).docshellID.toString(), docShell.historyID.toString());
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/sessionstore/test/browser_duplicate_history.js b/browser/components/sessionstore/test/browser_duplicate_history.js
|
|
|
+--- a/browser/components/sessionstore/test/browser_duplicate_history.js
|
|
|
++++ b/browser/components/sessionstore/test/browser_duplicate_history.js
|
|
|
+@@ -12,11 +12,12 @@ add_task(async function() {
|
|
|
+ let before = TabStateCache.get(aBrowser);
|
|
|
+
|
|
|
+ let newTab = SessionStore.duplicateTab(window, tab);
|
|
|
+ await BrowserTestUtils.browserLoaded(newTab.linkedBrowser);
|
|
|
+ let after = TabStateCache.get(newTab.linkedBrowser);
|
|
|
+
|
|
|
+ isnot(before.history.entries, after.history.entries,
|
|
|
+ "The entry objects should not be shared");
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/browser/components/sessionstore/test/browser_multiple_navigateAndRestore.js b/browser/components/sessionstore/test/browser_multiple_navigateAndRestore.js
|
|
|
+--- a/browser/components/sessionstore/test/browser_multiple_navigateAndRestore.js
|
|
|
++++ b/browser/components/sessionstore/test/browser_multiple_navigateAndRestore.js
|
|
|
+@@ -27,10 +27,10 @@ add_task(async function() {
|
|
|
+ is(browser.currentURI.spec, PAGE_2, "Should have PAGE_2 as the browser currentURI");
|
|
|
+
|
|
|
+ await ContentTask.spawn(browser, PAGE_2, async function(expectedURL) {
|
|
|
+ docShell.QueryInterface(Ci.nsIWebNavigation);
|
|
|
+ Assert.equal(docShell.currentURI.spec, expectedURL,
|
|
|
+ "Content should have PAGE_2 as the browser currentURI");
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/sessionstore/test/browser_newtab_userTypedValue.js b/browser/components/sessionstore/test/browser_newtab_userTypedValue.js
|
|
|
+--- a/browser/components/sessionstore/test/browser_newtab_userTypedValue.js
|
|
|
++++ b/browser/components/sessionstore/test/browser_newtab_userTypedValue.js
|
|
|
+@@ -35,17 +35,17 @@ add_task(async function() {
|
|
|
+ await TabStateFlusher.flush(win.gBrowser.selectedBrowser);
|
|
|
+
|
|
|
+ is(win.gURLBar.value, "", "URL bar should be empty");
|
|
|
+ tab = win.gBrowser.selectedTab;
|
|
|
+ is(tab.linkedBrowser.userTypedValue, null, "userTypedValue should be null");
|
|
|
+ state = JSON.parse(SessionStore.getTabState(tab));
|
|
|
+ ok(!state.userTypedValue, "userTypedValue should be undefined on the tab's state");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ for (let url of gInitialPages) {
|
|
|
+ if (url == BROWSER_NEW_TAB_URL) {
|
|
|
+ continue; // We tested about:newtab using BrowserOpenTab() above.
|
|
|
+ }
|
|
|
+ info("Testing " + url + " - " + new Date());
|
|
|
+ await BrowserTestUtils.openNewForegroundTab(win.gBrowser, url);
|
|
|
+ await BrowserTestUtils.closeWindow(win);
|
|
|
+@@ -62,15 +62,15 @@ add_task(async function() {
|
|
|
+
|
|
|
+ is(win.gURLBar.value, "", "URL bar should be empty");
|
|
|
+ tab = win.gBrowser.selectedTab;
|
|
|
+ is(tab.linkedBrowser.userTypedValue, null, "userTypedValue should be null");
|
|
|
+ state = JSON.parse(SessionStore.getTabState(tab));
|
|
|
+ ok(!state.userTypedValue, "userTypedValue should be undefined on the tab's state");
|
|
|
+
|
|
|
+ info("Removing tab - " + new Date());
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ info("Finished removing tab - " + new Date());
|
|
|
+ }
|
|
|
+ info("Removing window - " + new Date());
|
|
|
+ await BrowserTestUtils.closeWindow(win);
|
|
|
+ info("Finished removing window - " + new Date());
|
|
|
+ });
|
|
|
+diff --git a/browser/components/sessionstore/test/browser_parentProcessRestoreHash.js b/browser/components/sessionstore/test/browser_parentProcessRestoreHash.js
|
|
|
+--- a/browser/components/sessionstore/test/browser_parentProcessRestoreHash.js
|
|
|
++++ b/browser/components/sessionstore/test/browser_parentProcessRestoreHash.js
|
|
|
+@@ -84,12 +84,12 @@ add_task(async function() {
|
|
|
+ ok(!tab.linkedBrowser.isRemoteBrowser, "Browser should no longer be remote");
|
|
|
+
|
|
|
+ is(gURLBar.textValue, TESTURL, "URL bar visible value should be correct.");
|
|
|
+ is(gURLBar.value, TESTURL, "URL bar value should be correct.");
|
|
|
+ is(gURLBar.getAttribute("pageproxystate"), "valid", "URL bar is in valid page proxy state");
|
|
|
+
|
|
|
+ ok(!tab.linkedBrowser.userTypedValue, "No userTypedValue should be on the browser.");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ gBrowser.removeProgressListener(wpl);
|
|
|
+ TestAboutPage.unregister();
|
|
|
+ });
|
|
|
+diff --git a/browser/components/sessionstore/test/browser_revive_crashed_bg_tabs.js b/browser/components/sessionstore/test/browser_revive_crashed_bg_tabs.js
|
|
|
+--- a/browser/components/sessionstore/test/browser_revive_crashed_bg_tabs.js
|
|
|
++++ b/browser/components/sessionstore/test/browser_revive_crashed_bg_tabs.js
|
|
|
+@@ -46,11 +46,11 @@ add_task(async function test_revive_bg_t
|
|
|
+
|
|
|
+ // Now select newTab2 to make sure it restores.
|
|
|
+ let newTab2Restored = promiseTabRestored(newTab2);
|
|
|
+ gBrowser.selectedTab = newTab2;
|
|
|
+ await newTab2Restored;
|
|
|
+
|
|
|
+ ok(browser2.isRemoteBrowser, "Restored browser should be remote");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(newTab1);
|
|
|
+- await BrowserTestUtils.removeTab(newTab2);
|
|
|
++ BrowserTestUtils.removeTab(newTab1);
|
|
|
++ BrowserTestUtils.removeTab(newTab2);
|
|
|
+ });
|
|
|
+diff --git a/browser/components/sessionstore/test/browser_unrestored_crashedTabs.js b/browser/components/sessionstore/test/browser_unrestored_crashedTabs.js
|
|
|
+--- a/browser/components/sessionstore/test/browser_unrestored_crashedTabs.js
|
|
|
++++ b/browser/components/sessionstore/test/browser_unrestored_crashedTabs.js
|
|
|
+@@ -59,11 +59,11 @@ add_task(async function test() {
|
|
|
+ ok(!originalTab.isRemoteBrowser, "Should not be remote");
|
|
|
+
|
|
|
+ // We'd better be able to restore it still.
|
|
|
+ gBrowser.selectedTab = originalTab;
|
|
|
+ SessionStore.reviveCrashedTab(originalTab);
|
|
|
+ await promiseTabRestored(originalTab);
|
|
|
+
|
|
|
+ // Clean up.
|
|
|
+- await BrowserTestUtils.removeTab(unrestoredTab);
|
|
|
++ BrowserTestUtils.removeTab(unrestoredTab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/browser/extensions/formautofill/test/browser/browser_autocomplete_footer.js b/browser/extensions/formautofill/test/browser/browser_autocomplete_footer.js
|
|
|
+--- a/browser/extensions/formautofill/test/browser/browser_autocomplete_footer.js
|
|
|
++++ b/browser/extensions/formautofill/test/browser/browser_autocomplete_footer.js
|
|
|
+@@ -29,17 +29,17 @@ add_task(async function test_click_on_fo
|
|
|
+ const optionButton = itemsBox.querySelector(".autocomplete-richlistitem:last-child")._optionButton;
|
|
|
+ const prefTabPromise = BrowserTestUtils.waitForNewTab(gBrowser, PRIVACY_PREF_URL);
|
|
|
+ // Wait for dropdown animation finished to continue mouse synthesizing.
|
|
|
+ await sleep(1000);
|
|
|
+ await EventUtils.synthesizeMouseAtCenter(optionButton, {});
|
|
|
+ info(`expecting tab: about:preferences#privacy opened`);
|
|
|
+ const prefTab = await prefTabPromise;
|
|
|
+ info(`expecting tab: about:preferences#privacy removed`);
|
|
|
+- await BrowserTestUtils.removeTab(prefTab);
|
|
|
++ BrowserTestUtils.removeTab(prefTab);
|
|
|
+ ok(true, "Tab: preferences#privacy was successfully opened by clicking on the footer");
|
|
|
+
|
|
|
+ await closePopup(browser);
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_press_enter_on_footer() {
|
|
|
+ await BrowserTestUtils.withNewTab({gBrowser, url: URL}, async function(browser) {
|
|
|
+@@ -51,17 +51,17 @@ add_task(async function test_press_enter
|
|
|
+ const prefTabPromise = BrowserTestUtils.waitForNewTab(gBrowser, PRIVACY_PREF_URL);
|
|
|
+ for (let i = 0; i < listItemElems.length; i++) {
|
|
|
+ await BrowserTestUtils.synthesizeKey("VK_DOWN", {}, browser);
|
|
|
+ }
|
|
|
+ await BrowserTestUtils.synthesizeKey("VK_RETURN", {}, browser);
|
|
|
+ info(`expecting tab: about:preferences#privacy opened`);
|
|
|
+ const prefTab = await prefTabPromise;
|
|
|
+ info(`expecting tab: about:preferences#privacy removed`);
|
|
|
+- await BrowserTestUtils.removeTab(prefTab);
|
|
|
++ BrowserTestUtils.removeTab(prefTab);
|
|
|
+ ok(true, "Tab: preferences#privacy was successfully opened by pressing enter on the footer");
|
|
|
+
|
|
|
+ await closePopup(browser);
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_phishing_warning_single_category() {
|
|
|
+ await BrowserTestUtils.withNewTab({gBrowser, url: URL}, async function(browser) {
|
|
|
+diff --git a/browser/extensions/formautofill/test/browser/browser_first_time_use_doorhanger.js b/browser/extensions/formautofill/test/browser/browser_first_time_use_doorhanger.js
|
|
|
+--- a/browser/extensions/formautofill/test/browser/browser_first_time_use_doorhanger.js
|
|
|
++++ b/browser/extensions/formautofill/test/browser/browser_first_time_use_doorhanger.js
|
|
|
+@@ -30,17 +30,17 @@ add_task(async function test_first_time_
|
|
|
+
|
|
|
+ await promiseShown;
|
|
|
+ let cb = getDoorhangerCheckbox();
|
|
|
+ ok(cb.hidden, "Sync checkbox should be hidden");
|
|
|
+ // Open the panel via main button
|
|
|
+ await clickDoorhangerButton(MAIN_BUTTON);
|
|
|
+ let tab = await tabPromise;
|
|
|
+ ok(tab, "Privacy panel opened");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ );
|
|
|
+
|
|
|
+ addresses = await getAddresses();
|
|
|
+ is(addresses.length, 1, "Address saved");
|
|
|
+ let ftuPref = SpecialPowers.getBoolPref(FTU_PREF);
|
|
|
+ is(ftuPref, false, "First time use flag is false");
|
|
|
+ });
|
|
|
+@@ -109,15 +109,15 @@ add_task(async function test_first_time_
|
|
|
+ is(cb.checked, false, "Checkbox state should match addresses sync state");
|
|
|
+ cb.click();
|
|
|
+ is(SpecialPowers.getBoolPref(SYNC_ADDRESSES_PREF), true,
|
|
|
+ "addresses sync should be enabled after checked");
|
|
|
+ // Open the panel via main button
|
|
|
+ await clickDoorhangerButton(MAIN_BUTTON);
|
|
|
+ let tab = await tabPromise;
|
|
|
+ ok(tab, "Privacy panel opened");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ );
|
|
|
+
|
|
|
+ let ftuPref = SpecialPowers.getBoolPref(FTU_PREF);
|
|
|
+ is(ftuPref, false, "First time use flag is false");
|
|
|
+ });
|
|
|
+diff --git a/browser/modules/test/browser/browser_PageActions.js b/browser/modules/test/browser/browser_PageActions.js
|
|
|
+--- a/browser/modules/test/browser/browser_PageActions.js
|
|
|
++++ b/browser/modules/test/browser/browser_PageActions.js
|
|
|
+@@ -10,17 +10,17 @@ add_task(async function init() {
|
|
|
+ // The page action urlbar button, and therefore the panel, is only shown when
|
|
|
+ // the current tab is actionable -- i.e., a normal web page. about:blank is
|
|
|
+ // not, so open a new tab first thing, and close it when this test is done.
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab({
|
|
|
+ gBrowser,
|
|
|
+ url: "http://example.com/",
|
|
|
+ });
|
|
|
+ registerCleanupFunction(async () => {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
+ // Tests a simple non-built-in action without an iframe or subview. Also
|
|
|
+ // thoroughly checks most of the action's properties, methods, and DOM nodes, so
|
|
|
+ // it's not necessary to do that in general in other test tasks.
|
|
|
+ add_task(async function simple() {
|
|
|
+diff --git a/browser/modules/test/browser/browser_PageActions.js.1442465-4_2.later b/browser/modules/test/browser/browser_PageActions.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/modules/test/browser/browser_PageActions.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,40 @@
|
|
|
++--- browser_PageActions.js
|
|
|
+++++ browser_PageActions.js
|
|
|
++@@ -1312,17 +1312,17 @@ add_task(async function contextMenu() {
|
|
|
++ Assert.equal(menuItems[2].label, "Manage Extension\u2026",
|
|
|
++ "'Manage' item is present");
|
|
|
++ contextMenuPromise = promisePanelHidden("pageActionContextMenu");
|
|
|
++ let aboutAddonsPromise =
|
|
|
++ BrowserTestUtils.waitForNewTab(gBrowser, "about:addons");
|
|
|
++ EventUtils.synthesizeMouseAtCenter(menuItems[2], {});
|
|
|
++ let values = await Promise.all([aboutAddonsPromise, contextMenuPromise]);
|
|
|
++ let aboutAddonsTab = values[0];
|
|
|
++- await BrowserTestUtils.removeTab(aboutAddonsTab);
|
|
|
+++ BrowserTestUtils.removeTab(aboutAddonsTab);
|
|
|
++
|
|
|
++ // Open the context menu on the action's urlbar button.
|
|
|
++ let urlbarButton = BrowserPageActions.urlbarButtonNodeForActionID(action.id);
|
|
|
++ contextMenuPromise = promisePanelShown("pageActionContextMenu");
|
|
|
++ EventUtils.synthesizeMouseAtCenter(urlbarButton, {
|
|
|
++ type: "contextmenu",
|
|
|
++ button: 2,
|
|
|
++ });
|
|
|
++@@ -1398,17 +1398,17 @@ add_task(async function contextMenu() {
|
|
|
++ Assert.equal(menuItems[2].label, "Manage Extension\u2026",
|
|
|
++ "'Manage' item is present");
|
|
|
++ contextMenuPromise = promisePanelHidden("pageActionContextMenu");
|
|
|
++ aboutAddonsPromise =
|
|
|
++ BrowserTestUtils.waitForNewTab(gBrowser, "about:addons");
|
|
|
++ EventUtils.synthesizeMouseAtCenter(menuItems[2], {});
|
|
|
++ values = await Promise.all([aboutAddonsPromise, contextMenuPromise]);
|
|
|
++ aboutAddonsTab = values[0];
|
|
|
++- await BrowserTestUtils.removeTab(aboutAddonsTab);
|
|
|
+++ BrowserTestUtils.removeTab(aboutAddonsTab);
|
|
|
++
|
|
|
++ // Done, clean up.
|
|
|
++ action.remove();
|
|
|
++
|
|
|
++ // urlbar tests that run after this one can break if the mouse is left over
|
|
|
++ // the area where the urlbar popup appears, which seems to happen due to the
|
|
|
++ // above synthesized mouse events. Move it over the urlbar.
|
|
|
++ EventUtils.synthesizeMouseAtCenter(gURLBar, { type: "mousemove" });
|
|
|
+diff --git a/browser/modules/test/browser/browser_SitePermissions.js b/browser/modules/test/browser/browser_SitePermissions.js
|
|
|
+--- a/browser/modules/test/browser/browser_SitePermissions.js
|
|
|
++++ b/browser/modules/test/browser/browser_SitePermissions.js
|
|
|
+@@ -84,11 +84,11 @@ add_task(async function testGetAllPermis
|
|
|
+
|
|
|
+ SitePermissions.remove(uri, "cookie");
|
|
|
+ SitePermissions.remove(uri, "popup");
|
|
|
+ SitePermissions.remove(uri, "geo");
|
|
|
+ SitePermissions.remove(uri, "shortcuts");
|
|
|
+
|
|
|
+ Services.prefs.clearUserPref("permissions.default.shortcuts");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/browser/modules/test/browser/browser_urlBar_zoom.js.1442465-4_2.later b/browser/modules/test/browser/browser_urlBar_zoom.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/modules/test/browser/browser_urlBar_zoom.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,21 @@
|
|
|
++--- browser_urlBar_zoom.js
|
|
|
+++++ browser_urlBar_zoom.js
|
|
|
++@@ -30,17 +30,17 @@ async function testZoomButtonAppearsAndD
|
|
|
++ let zoomResetPromise = BrowserTestUtils.waitForEvent(window, zoomEventType);
|
|
|
++ zoomResetButton.click();
|
|
|
++ await zoomResetPromise;
|
|
|
++ pageZoomLevel = Math.floor(ZoomManager.zoom * 100);
|
|
|
++ expectedZoomLevel = 100;
|
|
|
++ is(pageZoomLevel, expectedZoomLevel, "Clicking zoom button successfully resets browser zoom to 100%");
|
|
|
++ is(zoomResetButton.hidden, true, "Zoom reset button returns to being hidden");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ }
|
|
|
++
|
|
|
++ add_task(async function() {
|
|
|
++ await testZoomButtonAppearsAndDisappearsBasedOnZoomChanges("FullZoomChange");
|
|
|
++ await SpecialPowers.pushPrefEnv({"set": [["browser.zoom.full", false]]});
|
|
|
++ await testZoomButtonAppearsAndDisappearsBasedOnZoomChanges("TextZoomChange");
|
|
|
++ await SpecialPowers.pushPrefEnv({"set": [["browser.zoom.full", true]]});
|
|
|
++ });
|
|
|
+diff --git a/browser/modules/test/browser/formValidation/browser_validation_invisible.js.1442465-4_2.later b/browser/modules/test/browser/formValidation/browser_validation_invisible.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/browser/modules/test/browser/formValidation/browser_validation_invisible.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,31 @@
|
|
|
++--- browser_validation_invisible.js
|
|
|
+++++ browser_validation_invisible.js
|
|
|
++@@ -24,26 +24,26 @@ add_task(async function test_display_non
|
|
|
++ incrementTest();
|
|
|
++ let testPage =
|
|
|
++ "data:text/html;charset=utf-8," +
|
|
|
++ '<form target="t"><input type="url" placeholder="url" value="http://" style="display: none;"><input id="s" type="button" value="check"></form>';
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, testPage);
|
|
|
++ await BrowserTestUtils.synthesizeMouse("#s", 0, 0, {}, gBrowser.selectedBrowser);
|
|
|
++
|
|
|
++ checkPopupHide();
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ /**
|
|
|
++ * In this test, we check that no popup appears if the element visibility is hidden.
|
|
|
++ */
|
|
|
++ add_task(async function test_visibility_hidden() {
|
|
|
++ incrementTest();
|
|
|
++ let testPage =
|
|
|
++ "data:text/html;charset=utf-8," +
|
|
|
++ '<form target="t"><input type="url" placeholder="url" value="http://" style="visibility: hidden;"><input id="s" type="button" value="check"></form>';
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, testPage);
|
|
|
++ await BrowserTestUtils.synthesizeMouse("#s", 0, 0, {}, gBrowser.selectedBrowser);
|
|
|
++
|
|
|
++ checkPopupHide();
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
+diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
|
|
|
+--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
|
|
|
++++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
|
|
|
+@@ -115,17 +115,17 @@ var PermissionPrompts = {
|
|
|
+ },
|
|
|
+ },
|
|
|
+ };
|
|
|
+
|
|
|
+ async function closeLastTab() {
|
|
|
+ if (!lastTab) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+- await BrowserTestUtils.removeTab(lastTab);
|
|
|
++ BrowserTestUtils.removeTab(lastTab);
|
|
|
+ lastTab = null;
|
|
|
+ }
|
|
|
+
|
|
|
+ async function clickOn(selector) {
|
|
|
+ let browserWindow = Services.wm.getMostRecentWindow("navigator:browser");
|
|
|
+
|
|
|
+ // Save the tab so we can close it later.
|
|
|
+ lastTab = await BrowserTestUtils.openNewForegroundTab(browserWindow.gBrowser, URL);
|
|
|
+diff --git a/devtools/client/jsonview/test/browser_jsonview_serviceworker.js b/devtools/client/jsonview/test/browser_jsonview_serviceworker.js
|
|
|
+--- a/devtools/client/jsonview/test/browser_jsonview_serviceworker.js
|
|
|
++++ b/devtools/client/jsonview/test/browser_jsonview_serviceworker.js
|
|
|
+@@ -60,14 +60,14 @@ add_task(async function() {
|
|
|
+ await clickJsonNode(".jsonPanelBox .treeTable .treeLabel");
|
|
|
+ is(await countRows(), 1, "There must be one row");
|
|
|
+
|
|
|
+ await ContentTask.spawn(browser, { script: SW, scope: TEST_JSON_URL }, async opts => {
|
|
|
+ let reg = await content.navigator.serviceWorker.getRegistration(opts.scope);
|
|
|
+ await reg.unregister();
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(swTab);
|
|
|
++ BrowserTestUtils.removeTab(swTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ function countRows() {
|
|
|
+ return getElementCount(".jsonPanelBox .treeTable .treeRow");
|
|
|
+ }
|
|
|
+diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_error_source_click.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_error_source_click.js
|
|
|
+--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_error_source_click.js
|
|
|
++++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_error_source_click.js
|
|
|
+@@ -49,10 +49,10 @@ async function waitForMessageAndViewSour
|
|
|
+
|
|
|
+ let locationNode = msg.querySelector(".message-location .frame-link-source");
|
|
|
+ ok(locationNode, "Message location link element found");
|
|
|
+
|
|
|
+ let onTabOpen = BrowserTestUtils.waitForNewTab(gBrowser, null, true);
|
|
|
+ locationNode.click();
|
|
|
+ let newTab = await onTabOpen;
|
|
|
+ ok(true, "The view source tab was opened in response to clicking the link");
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ }
|
|
|
+diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_clickable_urls.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_clickable_urls.js
|
|
|
+--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_clickable_urls.js
|
|
|
++++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_clickable_urls.js
|
|
|
+@@ -27,10 +27,10 @@ add_task(async function() {
|
|
|
+
|
|
|
+ info("Clicking on the link");
|
|
|
+ link.click();
|
|
|
+
|
|
|
+ const newTab = await onTabLoaded;
|
|
|
+ // We only need to check that newTab is truthy since
|
|
|
+ // BrowserTestUtils.waitForNewTab checks the URL.
|
|
|
+ ok(newTab, "The expected tab was opened.");
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ });
|
|
|
+diff --git a/docshell/test/browser/browser_click_link_within_view_source.js b/docshell/test/browser/browser_click_link_within_view_source.js
|
|
|
+--- a/docshell/test/browser/browser_click_link_within_view_source.js
|
|
|
++++ b/docshell/test/browser/browser_click_link_within_view_source.js
|
|
|
+@@ -50,11 +50,11 @@ add_task(async function test_click_link_
|
|
|
+
|
|
|
+ await loadPromise;
|
|
|
+
|
|
|
+ tabSpec = gBrowser.selectedBrowser.currentURI.spec;
|
|
|
+ info("loading: " + tabSpec);
|
|
|
+ ok(tabSpec.startsWith("view-source:file://") && tabSpec.endsWith(DUMMY_FILE),
|
|
|
+ "loading view-source of html succeeded");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/docshell/test/browser/browser_history_triggeringprincipal_viewsource.js b/docshell/test/browser/browser_history_triggeringprincipal_viewsource.js
|
|
|
+--- a/docshell/test/browser/browser_history_triggeringprincipal_viewsource.js
|
|
|
++++ b/docshell/test/browser/browser_history_triggeringprincipal_viewsource.js
|
|
|
+@@ -40,11 +40,11 @@ add_task(async function() {
|
|
|
+ loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, VIEW_SRC_URI);
|
|
|
+ let backItem = backCtxtMenu.getElementsByAttribute("id", "context-back")[0];
|
|
|
+ backItem.click();
|
|
|
+ backCtxtMenu.hidePopup();
|
|
|
+ await loadPromise;
|
|
|
+ is(gBrowser.selectedBrowser.currentURI.spec, VIEW_SRC_URI,
|
|
|
+ "clicking .back() to view-source of html succeeded");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/docshell/test/browser/browser_uriFixupAlternateRedirects.js b/docshell/test/browser/browser_uriFixupAlternateRedirects.js
|
|
|
+--- a/docshell/test/browser/browser_uriFixupAlternateRedirects.js
|
|
|
++++ b/docshell/test/browser/browser_uriFixupAlternateRedirects.js
|
|
|
+@@ -20,10 +20,10 @@ add_task(async function() {
|
|
|
+ ok(contentURL.startsWith(errorURI), "Should be on an error page");
|
|
|
+
|
|
|
+ const contentPrincipal = tab.linkedBrowser.contentPrincipal;
|
|
|
+ ok(contentPrincipal.URI.spec.startsWith(errorURI), "Principal should be for the error page");
|
|
|
+
|
|
|
+ originalURL = new URL(originalURL);
|
|
|
+ is(originalURL.host, "example", "Should be an error for http://example, not http://www.example.com/");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/dom/base/test/browser_aboutnewtab_process_selection.js.1442465-4_2.later b/dom/base/test/browser_aboutnewtab_process_selection.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/dom/base/test/browser_aboutnewtab_process_selection.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,37 @@
|
|
|
++--- browser_aboutnewtab_process_selection.js
|
|
|
+++++ browser_aboutnewtab_process_selection.js
|
|
|
++@@ -64,18 +64,18 @@ add_task(async function(){
|
|
|
++ await ContentTask.spawn(tab1.linkedBrowser, null, async function() {
|
|
|
++ const TEST_URL = "http://www.example.com/browser/dom/base/test/dummy.html";
|
|
|
++ content.location.href = TEST_URL;
|
|
|
++ });
|
|
|
++ await BrowserTestUtils.browserLoaded(tab1.linkedBrowser, false, TEST_URL);
|
|
|
++ is(ppmm.childCount, originalChildCount + 2,
|
|
|
++ "Navigating away from the preloaded browser (child side) should create a new content process.")
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab1);
|
|
|
++- await BrowserTestUtils.removeTab(tab2);
|
|
|
+++ BrowserTestUtils.removeTab(tab1);
|
|
|
+++ BrowserTestUtils.removeTab(tab2);
|
|
|
++
|
|
|
++ // Make sure the preload browser does not keep any of the new processes alive.
|
|
|
++ gBrowser.removePreloadedBrowser();
|
|
|
++
|
|
|
++ // Since we kept alive all the processes, we can shut down the ones that do
|
|
|
++ // not host any tabs reliably.
|
|
|
++ ppmm.releaseCachedProcesses();
|
|
|
++ });
|
|
|
++@@ -97,12 +97,12 @@ add_task(async function preloaded_state_
|
|
|
++ is(preloadedTabState, PRELOADED_STATE, "The preloaded browser has the correct attribute");
|
|
|
++
|
|
|
++ // Navigate away and check that the attribute has been removed altogether
|
|
|
++ gBrowser.selectedBrowser.loadURI(TEST_URL);
|
|
|
++ let navigatedTabHasState = gBrowser.selectedBrowser.hasAttribute("preloadedState");
|
|
|
++ ok(!navigatedTabHasState, "Correctly removed the preloadState attribute when navigating away");
|
|
|
++
|
|
|
++ // Remove tabs and preloaded browsers
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ gBrowser.removePreloadedBrowser();
|
|
|
++ });
|
|
|
++
|
|
|
+diff --git a/dom/base/test/browser_bug1303838.js b/dom/base/test/browser_bug1303838.js
|
|
|
+--- a/dom/base/test/browser_bug1303838.js
|
|
|
++++ b/dom/base/test/browser_bug1303838.js
|
|
|
+@@ -98,18 +98,18 @@ async function testLinkClick(withFrame,
|
|
|
+
|
|
|
+ if (!loadDivertedInBackground) {
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, tab);
|
|
|
+ }
|
|
|
+ await clickLink(withFrame, "#frame-link-3", tab.linkedBrowser, testTab.linkedBrowser, !loadDivertedInBackground);
|
|
|
+ is(gBrowser.tabs.length, 3, "check tabs.length");
|
|
|
+ is(gBrowser.selectedTab, loadDivertedInBackground ? tab : testTab, "check selectedTab");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(testTab);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(testTab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ function clickLink(isFrame, linkId, browser, testBrowser, awaitTabSwitch = false, locationChangeNum = 1) {
|
|
|
+ let promises = [];
|
|
|
+ if (awaitTabSwitch) {
|
|
|
+ promises.push(waitForTabSwitch(gBrowser));
|
|
|
+ }
|
|
|
+ promises.push(testBrowser ?
|
|
|
+diff --git a/dom/base/test/browser_bug902350.js b/dom/base/test/browser_bug902350.js
|
|
|
+--- a/dom/base/test/browser_bug902350.js
|
|
|
++++ b/dom/base/test/browser_bug902350.js
|
|
|
+@@ -35,10 +35,10 @@ add_task(async function mixed_content_bl
|
|
|
+ // Navigating to insecure domain through target='_top' should succeed.
|
|
|
+ await insecureLoadPromise;
|
|
|
+
|
|
|
+ // The link click should not invoke the Mixed Content Blocker.
|
|
|
+ let {gIdentityHandler} = testBrowser.ownerGlobal;
|
|
|
+ ok (!gIdentityHandler._identityBox.classList.contains("mixedActiveBlocked"),
|
|
|
+ "Mixed Content Doorhanger did not appear when trying to navigate top");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ });
|
|
|
+diff --git a/dom/base/test/browser_inputStream_structuredClone.js b/dom/base/test/browser_inputStream_structuredClone.js
|
|
|
+--- a/dom/base/test/browser_inputStream_structuredClone.js
|
|
|
++++ b/dom/base/test/browser_inputStream_structuredClone.js
|
|
|
+@@ -34,17 +34,17 @@ async function runTest(input, url) {
|
|
|
+
|
|
|
+ return dataBack;
|
|
|
+ });
|
|
|
+
|
|
|
+ ok(dataBack.check, "The inputStream is a nsIInputStream also on content.");
|
|
|
+ ok(data.inputStream instanceof Ci.nsIInputStream, "The original object was an inputStream");
|
|
|
+ ok(dataBack.inputStream instanceof Ci.nsIInputStream, "We have an inputStream back from the content.");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function test() {
|
|
|
+ let a = "a";
|
|
|
+ for (let i = 0; i < 25; ++i) {
|
|
|
+ a+=a;
|
|
|
+ }
|
|
|
+
|
|
|
+diff --git a/dom/base/test/browser_timeout_throttling_with_audio_playback.js b/dom/base/test/browser_timeout_throttling_with_audio_playback.js
|
|
|
+--- a/dom/base/test/browser_timeout_throttling_with_audio_playback.js
|
|
|
++++ b/dom/base/test/browser_timeout_throttling_with_audio_playback.js
|
|
|
+@@ -42,17 +42,17 @@ async function runTest(url) {
|
|
|
+ let after = new Date();
|
|
|
+ resolve(after - before);
|
|
|
+ }, delay);
|
|
|
+ });
|
|
|
+ });
|
|
|
+ ok(timeout <= kMinTimeoutBackground, `Got the correct timeout (${timeout})`);
|
|
|
+
|
|
|
+ // All done.
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function setup() {
|
|
|
+ await SpecialPowers.pushPrefEnv({"set": [
|
|
|
+ ["dom.min_background_timeout_value", kMinTimeoutBackground],
|
|
|
+ ]});
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/dom/broadcastchannel/tests/browser_private_browsing.js b/dom/broadcastchannel/tests/browser_private_browsing.js
|
|
|
+--- a/dom/broadcastchannel/tests/browser_private_browsing.js
|
|
|
++++ b/dom/broadcastchannel/tests/browser_private_browsing.js
|
|
|
+@@ -59,14 +59,14 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ var what1 = await p1;
|
|
|
+ ok(what1, 'hello world from private browsing', 'No messages received from the other window.');
|
|
|
+
|
|
|
+ var what2 = await p2;
|
|
|
+ ok(what1, 'hello world from non private browsing', 'No messages received from the other window.');
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
+ await BrowserTestUtils.closeWindow(win1);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ await BrowserTestUtils.closeWindow(win2);
|
|
|
+ });
|
|
|
+diff --git a/dom/file/ipc/tests/browser_ipcBlob.js b/dom/file/ipc/tests/browser_ipcBlob.js
|
|
|
+--- a/dom/file/ipc/tests/browser_ipcBlob.js
|
|
|
++++ b/dom/file/ipc/tests/browser_ipcBlob.js
|
|
|
+@@ -28,18 +28,18 @@ add_task(async function test_CtoPtoC_big
|
|
|
+ fr.onloadend = function() {
|
|
|
+ resolve(fr.result == new Array(1024*1024).join('123456789ABCDEF'));
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ ok(status, "CtoPtoC-big: Data match!");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Less than 1mb memory blob childA-parent-childB.
|
|
|
+ add_task(async function test_CtoPtoC_small() {
|
|
|
+ let tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
|
|
|
+ let browser1 = gBrowser.getBrowserForTab(tab1);
|
|
|
+
|
|
|
+ let blob = await ContentTask.spawn(browser1, null, function() {
|
|
|
+@@ -60,18 +60,18 @@ add_task(async function test_CtoPtoC_sma
|
|
|
+ fr.onloadend = function() {
|
|
|
+ resolve(fr.result == "hello world!");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ ok(status, "CtoPtoC-small: Data match!");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+
|
|
|
+ // More than 1mb memory blob childA-parent-childB: BroadcastChannel
|
|
|
+ add_task(async function test_CtoPtoC_bc_big() {
|
|
|
+ let tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
|
|
|
+ let browser1 = gBrowser.getBrowserForTab(tab1);
|
|
|
+
|
|
|
+ await ContentTask.spawn(browser1, null, function() {
|
|
|
+@@ -96,18 +96,18 @@ add_task(async function test_CtoPtoC_bc_
|
|
|
+ }
|
|
|
+
|
|
|
+ bc.postMessage("GO!");
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ ok(status, "CtoPtoC-broadcastChannel-big: Data match!");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Less than 1mb memory blob childA-parent-childB: BroadcastChannel
|
|
|
+ add_task(async function test_CtoPtoC_bc_small() {
|
|
|
+ let tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
|
|
|
+ let browser1 = gBrowser.getBrowserForTab(tab1);
|
|
|
+
|
|
|
+ await ContentTask.spawn(browser1, null, function() {
|
|
|
+@@ -132,18 +132,18 @@ add_task(async function test_CtoPtoC_bc_
|
|
|
+ }
|
|
|
+
|
|
|
+ bc.postMessage("GO!");
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ ok(status, "CtoPtoC-broadcastChannel-small: Data match!");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+
|
|
|
+ // blob URL childA-parent-childB
|
|
|
+ add_task(async function test_CtoPtoC_bc_small() {
|
|
|
+ let tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
|
|
|
+ let browser1 = gBrowser.getBrowserForTab(tab1);
|
|
|
+
|
|
|
+ let blobURL = await ContentTask.spawn(browser1, null, function() {
|
|
|
+@@ -162,18 +162,18 @@ add_task(async function test_CtoPtoC_bc_
|
|
|
+ }
|
|
|
+
|
|
|
+ xhr.send();
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ ok(status, "CtoPtoC-blobURL: Data match!");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Multipart Blob childA-parent-childB.
|
|
|
+ add_task(async function test_CtoPtoC_multipart() {
|
|
|
+ let tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
|
|
|
+ let browser1 = gBrowser.getBrowserForTab(tab1);
|
|
|
+
|
|
|
+ let blob = await ContentTask.spawn(browser1, null, function() {
|
|
|
+@@ -195,11 +195,11 @@ add_task(async function test_CtoPtoC_mul
|
|
|
+ fr.onloadend = function() {
|
|
|
+ resolve(fr.result == "hello world!");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ ok(status, "CtoPtoC-multipart: Data match!");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+diff --git a/dom/file/ipc/tests/browser_ipcBlob_temporary.js b/dom/file/ipc/tests/browser_ipcBlob_temporary.js
|
|
|
+--- a/dom/file/ipc/tests/browser_ipcBlob_temporary.js
|
|
|
++++ b/dom/file/ipc/tests/browser_ipcBlob_temporary.js
|
|
|
+@@ -104,11 +104,11 @@ add_task(async function test() {
|
|
|
+ ok(status, "All good for tab1!");
|
|
|
+
|
|
|
+ status = await ContentTask.spawn(browser2, null, function() {
|
|
|
+ return content.window.testPromise;
|
|
|
+ });
|
|
|
+
|
|
|
+ ok(status, "All good for tab2!");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+diff --git a/dom/security/test/cors/browser_CORS-console-warnings.js b/dom/security/test/cors/browser_CORS-console-warnings.js
|
|
|
+--- a/dom/security/test/cors/browser_CORS-console-warnings.js
|
|
|
++++ b/dom/security/test/cors/browser_CORS-console-warnings.js
|
|
|
+@@ -22,21 +22,21 @@ function on_new_message(new_messages) {
|
|
|
+ let text = elem.textContent;
|
|
|
+ if (text.match('Cross-Origin Request Blocked:')) {
|
|
|
+ ok(true, "message is: " + text);
|
|
|
+ messages_seen++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+-function* do_cleanup() {
|
|
|
++async function do_cleanup() {
|
|
|
+ if (webconsole) {
|
|
|
+ webconsole.ui.off("new-messages", on_new_message);
|
|
|
+ }
|
|
|
+- yield unsetCookiePref();
|
|
|
++ await unsetCookiePref();
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Set e10s related preferences in the test environment.
|
|
|
+ * @return {Promise} promise that resolves when preferences are set.
|
|
|
+ */
|
|
|
+ function setCookiePref() {
|
|
|
+ return new Promise(resolve =>
|
|
|
+@@ -54,40 +54,40 @@ function setCookiePref() {
|
|
|
+ */
|
|
|
+ function unsetCookiePref() {
|
|
|
+ return new Promise(resolve => {
|
|
|
+ SpecialPowers.popPrefEnv(resolve);
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ //jscs:disable
|
|
|
+-add_task(function*() {
|
|
|
++add_task(async function() {
|
|
|
+ //jscs:enable
|
|
|
+ // A longer timeout is necessary for this test than the plain mochitests
|
|
|
+ // due to opening a new tab with the web console.
|
|
|
+ requestLongerTimeout(4);
|
|
|
+ registerCleanupFunction(do_cleanup);
|
|
|
+- yield setCookiePref();
|
|
|
++ await setCookiePref();
|
|
|
+
|
|
|
+ let test_uri = "http://mochi.test:8888/browser/dom/security/test/cors/file_cors_logging_test.html";
|
|
|
+
|
|
|
+- let tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank");
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank");
|
|
|
+
|
|
|
+- let toolbox = yield openToolboxForTab(tab, "webconsole");
|
|
|
++ let toolbox = await openToolboxForTab(tab, "webconsole");
|
|
|
+ ok(toolbox, "Got toolbox");
|
|
|
+ let hud = toolbox.getCurrentPanel().hud;
|
|
|
+ ok(hud, "Got hud");
|
|
|
+
|
|
|
+ if (!webconsole) {
|
|
|
+ registerCleanupFunction(do_cleanup);
|
|
|
+ hud.ui.on("new-messages", on_new_message);
|
|
|
+ webconsole = hud;
|
|
|
+ }
|
|
|
+
|
|
|
+ BrowserTestUtils.loadURI(gBrowser, test_uri);
|
|
|
+
|
|
|
+- yield BrowserTestUtils.waitForLocationChange(gBrowser, test_uri+"#finished");
|
|
|
++ await BrowserTestUtils.waitForLocationChange(gBrowser, test_uri+"#finished");
|
|
|
+
|
|
|
+ // Different OS combinations
|
|
|
+ ok(messages_seen > 0, "Saw " + messages_seen + " messages.");
|
|
|
+
|
|
|
+- yield BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/dom/security/test/general/browser_test_toplevel_data_navigations.js b/dom/security/test/general/browser_test_toplevel_data_navigations.js
|
|
|
+--- a/dom/security/test/general/browser_test_toplevel_data_navigations.js
|
|
|
++++ b/dom/security/test/general/browser_test_toplevel_data_navigations.js
|
|
|
+@@ -22,33 +22,33 @@ add_task(async function test_nav_data_ur
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_nav_data_uri_redirect() {
|
|
|
+ await SpecialPowers.pushPrefEnv({
|
|
|
+ "set": [["security.data_uri.block_toplevel_data_uri_navigations", true]],
|
|
|
+ });
|
|
|
+ let tab = BrowserTestUtils.addTab(gBrowser, kRedirectURI);
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ // wait to make sure data: URI did not load before checking that it got blocked
|
|
|
+ await new Promise(resolve => setTimeout(resolve, 500));
|
|
|
+ await ContentTask.spawn(gBrowser.selectedBrowser, {}, async function() {
|
|
|
+ is(content.document.body.innerHTML, "",
|
|
|
+ "data: URI navigation after server redirect should be blocked");
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_nav_data_uri_meta_redirect() {
|
|
|
+ await SpecialPowers.pushPrefEnv({
|
|
|
+ "set": [["security.data_uri.block_toplevel_data_uri_navigations", true]],
|
|
|
+ });
|
|
|
+ let tab = BrowserTestUtils.addTab(gBrowser, kMetaRedirectURI);
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+ // wait to make sure data: URI did not load before checking that it got blocked
|
|
|
+ await new Promise(resolve => setTimeout(resolve, 500));
|
|
|
+ await ContentTask.spawn(gBrowser.selectedBrowser, {}, async function() {
|
|
|
+ is(content.document.body.innerHTML, "",
|
|
|
+ "data: URI navigation after meta redirect should be blocked");
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/dom/tests/browser/browser_autofocus_background.js b/dom/tests/browser/browser_autofocus_background.js
|
|
|
+--- a/dom/tests/browser/browser_autofocus_background.js
|
|
|
++++ b/dom/tests/browser/browser_autofocus_background.js
|
|
|
+@@ -26,12 +26,12 @@ add_task(async function() {
|
|
|
+ "The background tab's focused element should be " + testingList[i].tagName);
|
|
|
+ }
|
|
|
+
|
|
|
+ is(document.activeElement, tabs[0].linkedBrowser,
|
|
|
+ "The background tab's focused element should not cause the tab to be focused");
|
|
|
+
|
|
|
+ // Cleaning up.
|
|
|
+ for (let i = 1; i < tabs.length; i++) {
|
|
|
+- await BrowserTestUtils.removeTab(tabs[i]);
|
|
|
++ BrowserTestUtils.removeTab(tabs[i]);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/dom/tests/browser/browser_beforeunload_between_chrome_content.js b/dom/tests/browser/browser_beforeunload_between_chrome_content.js
|
|
|
+--- a/dom/tests/browser/browser_beforeunload_between_chrome_content.js
|
|
|
++++ b/dom/tests/browser/browser_beforeunload_between_chrome_content.js
|
|
|
+@@ -75,17 +75,17 @@ add_task(async function() {
|
|
|
+ let dialogShown2 = awaitAndCloseBeforeUnloadDialog(false);
|
|
|
+ gBrowser.goForward();
|
|
|
+ await Promise.all([
|
|
|
+ dialogShown2,
|
|
|
+ BrowserTestUtils.browserLoaded(browser)
|
|
|
+ ]);
|
|
|
+ is(beforeUnloadCount, 2, "Should have received two beforeunload events.");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Test navigation from a chrome page to a content page. Also check that only
|
|
|
+ * one beforeunload event is fired.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ let beforeUnloadCount = 0;
|
|
|
+@@ -136,10 +136,10 @@ add_task(async function() {
|
|
|
+ let dialogShown2 = awaitAndCloseBeforeUnloadDialog(false);
|
|
|
+ gBrowser.goForward();
|
|
|
+ await Promise.all([
|
|
|
+ dialogShown2,
|
|
|
+ BrowserTestUtils.browserLoaded(browser)
|
|
|
+ ]);
|
|
|
+ is(beforeUnloadCount, 2, "Should have received two beforeunload events.");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/dom/tests/browser/browser_bug1008941_dismissGeolocationHanger.js b/dom/tests/browser/browser_bug1008941_dismissGeolocationHanger.js
|
|
|
+--- a/dom/tests/browser/browser_bug1008941_dismissGeolocationHanger.js
|
|
|
++++ b/dom/tests/browser/browser_bug1008941_dismissGeolocationHanger.js
|
|
|
+@@ -19,10 +19,10 @@ add_task(async function testDismissHange
|
|
|
+ info("Clicked outside the Geolocation panel to dismiss it");
|
|
|
+
|
|
|
+ let hasLocation = await ContentTask.spawn(gBrowser.selectedBrowser, {}, async function() {
|
|
|
+ return content.document.body.innerHTML.includes("location...");
|
|
|
+ });
|
|
|
+
|
|
|
+ ok(hasLocation, "Location is not shared");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+diff --git a/dom/tests/browser/browser_bug1236512.js b/dom/tests/browser/browser_bug1236512.js
|
|
|
+--- a/dom/tests/browser/browser_bug1236512.js
|
|
|
++++ b/dom/tests/browser/browser_bug1236512.js
|
|
|
+@@ -62,17 +62,17 @@ add_task(async function() {
|
|
|
+ "window");
|
|
|
+ await new Promise(resolve => waitForFocus(resolve, window));
|
|
|
+ await waitContentVisibilityChange(true /* isHidden */, browserTest);
|
|
|
+
|
|
|
+ info("test window should still report 'hidden' since it is still fully covered " +
|
|
|
+ "by another window");
|
|
|
+ let tab = BrowserTestUtils.addTab(browserTest);
|
|
|
+ await BrowserTestUtils.switchTab(browserTest, tab);
|
|
|
+- await BrowserTestUtils.removeTab(browserTest.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(browserTest.selectedTab);
|
|
|
+ await testContentVisibilityState(true /* isHidden */, browserTest);
|
|
|
+
|
|
|
+ info("test window should report 'visible' if it is not fully covered by " +
|
|
|
+ "another window");
|
|
|
+ await new Promise(resolve => waitForFocus(resolve, winTest));
|
|
|
+ await waitContentVisibilityChange(false /* isHidden */, browserTest);
|
|
|
+
|
|
|
+ info("closing test window");
|
|
|
+diff --git a/dom/tests/browser/browser_localStorage_e10s.js b/dom/tests/browser/browser_localStorage_e10s.js
|
|
|
+--- a/dom/tests/browser/browser_localStorage_e10s.js
|
|
|
++++ b/dom/tests/browser/browser_localStorage_e10s.js
|
|
|
+@@ -60,17 +60,17 @@ async function openTestTabInOwnProcess(n
|
|
|
+ return knownTab;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Close all the tabs we opened.
|
|
|
+ */
|
|
|
+ async function cleanupTabs(knownTabs) {
|
|
|
+ for (let knownTab of knownTabs.byName.values()) {
|
|
|
+- await BrowserTestUtils.removeTab(knownTab.tab);
|
|
|
++ BrowserTestUtils.removeTab(knownTab.tab);
|
|
|
+ knownTab.cleanup();
|
|
|
+ }
|
|
|
+ knownTabs.cleanup();
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Wait for a LocalStorage flush to occur. This notification can occur as a
|
|
|
+ * result of any of:
|
|
|
+diff --git a/dom/tests/browser/browser_localStorage_privatestorageevent.js b/dom/tests/browser/browser_localStorage_privatestorageevent.js
|
|
|
+--- a/dom/tests/browser/browser_localStorage_privatestorageevent.js
|
|
|
++++ b/dom/tests/browser/browser_localStorage_privatestorageevent.js
|
|
|
+@@ -61,14 +61,14 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ let privSaw = await ContentTask.spawn(privBrowser, null, function(opts) {
|
|
|
+ return content.window.gotStorageEvent;
|
|
|
+ });
|
|
|
+
|
|
|
+ ok(!privSaw, "privWin shouldn't be able to see pubWin's storage events");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(privTab);
|
|
|
++ BrowserTestUtils.removeTab(privTab);
|
|
|
+ await BrowserTestUtils.closeWindow(privWin);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(pubTab);
|
|
|
++ BrowserTestUtils.removeTab(pubTab);
|
|
|
+ await BrowserTestUtils.closeWindow(pubWin);
|
|
|
+ });
|
|
|
+diff --git a/dom/tests/browser/browser_noopener.js b/dom/tests/browser/browser_noopener.js
|
|
|
+--- a/dom/tests/browser/browser_noopener.js
|
|
|
++++ b/dom/tests/browser/browser_noopener.js
|
|
|
+@@ -72,18 +72,18 @@ async function doTests(private, containe
|
|
|
+ is(content.window.name, test.name, "Name should match for " + testid);
|
|
|
+ if (test.opener) {
|
|
|
+ ok(content.window.opener, "Opener should have been set for " + testid);
|
|
|
+ } else {
|
|
|
+ ok(!content.window.opener, "Opener should not have been set for " + testid);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
+- await BrowserTestUtils.removeTab(originalTab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(originalTab);
|
|
|
+ }
|
|
|
+
|
|
|
+ window.close();
|
|
|
+ }
|
|
|
+
|
|
|
+ async function doAllTests() {
|
|
|
+ // Non-private window
|
|
|
+ await doTests(false, false);
|
|
|
+diff --git a/dom/tests/browser/browser_test_focus_after_modal_state.js b/dom/tests/browser/browser_test_focus_after_modal_state.js
|
|
|
+--- a/dom/tests/browser/browser_test_focus_after_modal_state.js
|
|
|
++++ b/dom/tests/browser/browser_test_focus_after_modal_state.js
|
|
|
+@@ -60,10 +60,10 @@ add_task(async function() {
|
|
|
+ await Promise.all([waitForBlur, waitForFocus]);
|
|
|
+ await ContentTask.spawn(browser, null, async function() {
|
|
|
+ is(content.document.activeElement, content.document.getElementById("edit"),
|
|
|
+ "Focus should be back on iframe element");
|
|
|
+ });
|
|
|
+ is(lastMessageReceived, "Test:FocusReceived",
|
|
|
+ "Should receive blur and then focus event");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/dom/tests/browser/browser_test_new_window_from_content.js b/dom/tests/browser/browser_test_new_window_from_content.js
|
|
|
+--- a/dom/tests/browser/browser_test_new_window_from_content.js
|
|
|
++++ b/dom/tests/browser/browser_test_new_window_from_content.js
|
|
|
+@@ -125,17 +125,17 @@ function prepareForResult(aBrowser, aExp
|
|
|
+ await BrowserTestUtils.closeWindow(newWin);
|
|
|
+ })();
|
|
|
+ break;
|
|
|
+ case kNewTab:
|
|
|
+ return (async function() {
|
|
|
+ let newTab = await BrowserTestUtils.waitForNewTab(gBrowser);
|
|
|
+ is(newTab.linkedBrowser.currentURI.spec, expectedSpec,
|
|
|
+ "Should be at dummy.html");
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ })();
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ ok(false, "prepareForResult can't handle an expectation of " + aExpectation)
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ return deferred.promise;
|
|
|
+diff --git a/dom/tests/browser/browser_test_toolbars_visibility.js b/dom/tests/browser/browser_test_toolbars_visibility.js
|
|
|
+--- a/dom/tests/browser/browser_test_toolbars_visibility.js
|
|
|
++++ b/dom/tests/browser/browser_test_toolbars_visibility.js
|
|
|
+@@ -130,17 +130,17 @@ add_task(async function() {
|
|
|
+ await BrowserTestUtils.synthesizeMouseAtCenter("#winOpenDefault", {}, browser);
|
|
|
+ let tab = await newTabPromise;
|
|
|
+
|
|
|
+ // Check that all toolbars are visible
|
|
|
+ let toolbars = await getToolbarsFromBrowserContent(gBrowser.selectedBrowser);
|
|
|
+ testDefaultToolbars(toolbars);
|
|
|
+
|
|
|
+ // Cleanup
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ // Now let's open a window with toolbars hidden
|
|
|
+ let winPromise = BrowserTestUtils.waitForNewWindow();
|
|
|
+ await BrowserTestUtils.synthesizeMouseAtCenter("#winOpenNonDefault", {}, browser);
|
|
|
+ let popupWindow = await winPromise;
|
|
|
+
|
|
|
+ let popupBrowser = popupWindow.gBrowser.selectedBrowser;
|
|
|
+ await BrowserTestUtils.browserLoaded(popupBrowser);
|
|
|
+diff --git a/dom/u2f/tests/browser/browser_abort_visibility.js b/dom/u2f/tests/browser/browser_abort_visibility.js
|
|
|
+--- a/dom/u2f/tests/browser/browser_abort_visibility.js
|
|
|
++++ b/dom/u2f/tests/browser/browser_abort_visibility.js
|
|
|
+@@ -86,16 +86,16 @@ add_task(async function test_abort() {
|
|
|
+ await startGetAssertionRequest(tab_get);
|
|
|
+ await assertStatus(tab_get, "pending");
|
|
|
+
|
|
|
+ // Switch back to the first tab, the get() request is aborted.
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, tab_create);
|
|
|
+ await waitForStatus(tab_get, "aborted");
|
|
|
+
|
|
|
+ // Close tabs.
|
|
|
+- await BrowserTestUtils.removeTab(tab_create);
|
|
|
+- await BrowserTestUtils.removeTab(tab_get);
|
|
|
++ BrowserTestUtils.removeTab(tab_create);
|
|
|
++ BrowserTestUtils.removeTab(tab_get);
|
|
|
+
|
|
|
+ // Cleanup.
|
|
|
+ Services.prefs.clearUserPref("security.webauth.u2f");
|
|
|
+ Services.prefs.clearUserPref("security.webauth.webauthn_enable_softtoken");
|
|
|
+ Services.prefs.clearUserPref("security.webauth.webauthn_enable_usbtoken");
|
|
|
+ });
|
|
|
+diff --git a/dom/u2f/tests/browser/browser_appid_localhost.js b/dom/u2f/tests/browser/browser_appid_localhost.js
|
|
|
+--- a/dom/u2f/tests/browser/browser_appid_localhost.js
|
|
|
++++ b/dom/u2f/tests/browser/browser_appid_localhost.js
|
|
|
+@@ -64,15 +64,15 @@ add_task(async function () {
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test: Correct TLD
|
|
|
+ await promiseU2FRegister(tab, "https://localhost:443/appId").then(res => {
|
|
|
+ is(res.errorCode, 0, "https://localhost:443/appId should work.");
|
|
|
+ });
|
|
|
+
|
|
|
+ // Close tab.
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ // Cleanup.
|
|
|
+ Services.prefs.clearUserPref("security.webauth.u2f");
|
|
|
+ Services.prefs.clearUserPref("security.webauth.webauthn_enable_softtoken");
|
|
|
+ Services.prefs.clearUserPref("security.webauth.webauthn_enable_usbtoken");
|
|
|
+ });
|
|
|
+diff --git a/dom/webauthn/tests/browser/browser_abort_visibility.js b/dom/webauthn/tests/browser/browser_abort_visibility.js
|
|
|
+--- a/dom/webauthn/tests/browser/browser_abort_visibility.js
|
|
|
++++ b/dom/webauthn/tests/browser/browser_abort_visibility.js
|
|
|
+@@ -102,18 +102,18 @@ add_task(async function test_switch_tab(
|
|
|
+ await startGetAssertionRequest(tab_get);
|
|
|
+ await assertStatus(tab_get, "pending");
|
|
|
+
|
|
|
+ // Switch back to the first tab, the get() request is aborted.
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, tab_create);
|
|
|
+ await waitForStatus(tab_get, "aborted");
|
|
|
+
|
|
|
+ // Close tabs.
|
|
|
+- await BrowserTestUtils.removeTab(tab_create);
|
|
|
+- await BrowserTestUtils.removeTab(tab_get);
|
|
|
++ BrowserTestUtils.removeTab(tab_create);
|
|
|
++ BrowserTestUtils.removeTab(tab_get);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_new_window_make() {
|
|
|
+ // Create a new tab for the MakeCredential() request.
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
|
|
|
+
|
|
|
+ // Start a MakeCredential request.
|
|
|
+ await startMakeCredentialRequest(tab);
|
|
|
+@@ -137,17 +137,17 @@ add_task(async function test_new_window_
|
|
|
+ await assertStatus(tab, "pending");
|
|
|
+
|
|
|
+ // Open a new window. The tab will lose focus.
|
|
|
+ let win = await BrowserTestUtils.openNewBrowserWindow();
|
|
|
+ await waitForStatus(tab, "aborted");
|
|
|
+ await BrowserTestUtils.closeWindow(win);
|
|
|
+
|
|
|
+ // Close tab.
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_minimize_make() {
|
|
|
+ let env = Cc["@mozilla.org/process/environment;1"]
|
|
|
+ .getService(Ci.nsIEnvironment);
|
|
|
+ // Minimizing windows doesn't supported in headless mode.
|
|
|
+ if (env.get("MOZ_HEADLESS")) {
|
|
|
+ return;
|
|
|
+@@ -163,17 +163,17 @@ add_task(async function test_minimize_ma
|
|
|
+ // Minimize the window.
|
|
|
+ window.minimize();
|
|
|
+ await waitForStatus(tab, "aborted");
|
|
|
+
|
|
|
+ // Restore the window.
|
|
|
+ await new Promise(resolve => SimpleTest.waitForFocus(resolve, window));
|
|
|
+
|
|
|
+ // Close tab.
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_minimize_get() {
|
|
|
+ let env = Cc["@mozilla.org/process/environment;1"]
|
|
|
+ .getService(Ci.nsIEnvironment);
|
|
|
+ // Minimizing windows doesn't supported in headless mode.
|
|
|
+ if (env.get("MOZ_HEADLESS")) {
|
|
|
+ return;
|
|
|
+@@ -189,10 +189,10 @@ add_task(async function test_minimize_ge
|
|
|
+ // Minimize the window.
|
|
|
+ window.minimize();
|
|
|
+ await waitForStatus(tab, "aborted");
|
|
|
+
|
|
|
+ // Restore the window.
|
|
|
+ await new Promise(resolve => SimpleTest.waitForFocus(resolve, window));
|
|
|
+
|
|
|
+ // Close tab.
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/dom/webauthn/tests/browser/browser_fido_appid_extension.js b/dom/webauthn/tests/browser/browser_fido_appid_extension.js
|
|
|
+--- a/dom/webauthn/tests/browser/browser_fido_appid_extension.js
|
|
|
++++ b/dom/webauthn/tests/browser/browser_fido_appid_extension.js
|
|
|
+@@ -137,17 +137,17 @@ add_task(async function test_appid() {
|
|
|
+ let rpIdHashSign = authenticatorData.slice(0, 32);
|
|
|
+ ok(memcmp(rpIdHash, rpIdHashSign), "rpIdHash is correct");
|
|
|
+
|
|
|
+ let clientData = JSON.parse(buffer2string(clientDataJSON));
|
|
|
+ is(clientData.clientExtensions.appid, appid, "appid extension sent");
|
|
|
+ });
|
|
|
+
|
|
|
+ // Close tab.
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(function test_cleanup() {
|
|
|
+ Services.prefs.clearUserPref("security.webauth.u2f");
|
|
|
+ Services.prefs.clearUserPref("security.webauth.webauthn");
|
|
|
+ Services.prefs.clearUserPref("security.webauth.webauthn_enable_softtoken");
|
|
|
+ Services.prefs.clearUserPref("security.webauth.webauthn_enable_usbtoken");
|
|
|
+ });
|
|
|
+diff --git a/dom/workers/test/serviceworkers/browser_download_canceled.js b/dom/workers/test/serviceworkers/browser_download_canceled.js
|
|
|
+--- a/dom/workers/test/serviceworkers/browser_download_canceled.js
|
|
|
++++ b/dom/workers/test/serviceworkers/browser_download_canceled.js
|
|
|
+@@ -137,11 +137,11 @@ add_task(async function interruptedDownl
|
|
|
+
|
|
|
+ // Cleanup
|
|
|
+ await ContentTask.spawn(
|
|
|
+ tab.linkedBrowser,
|
|
|
+ null,
|
|
|
+ function() {
|
|
|
+ return content.wrappedJSObject.registration.unregister();
|
|
|
+ });
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await clearDownloads();
|
|
|
+ });
|
|
|
+diff --git a/dom/workers/test/serviceworkers/browser_force_refresh.js b/dom/workers/test/serviceworkers/browser_force_refresh.js
|
|
|
+--- a/dom/workers/test/serviceworkers/browser_force_refresh.js
|
|
|
++++ b/dom/workers/test/serviceworkers/browser_force_refresh.js
|
|
|
+@@ -45,17 +45,17 @@ function test() {
|
|
|
+ async function done() {
|
|
|
+ tab.linkedBrowser.messageManager.removeMessageListener("test:event", eventHandler);
|
|
|
+
|
|
|
+ await ContentTask.spawn(tabBrowser, null, async function() {
|
|
|
+ const swr = await content.navigator.serviceWorker.getRegistration();
|
|
|
+ await swr.unregister();
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ executeSoon(finish);
|
|
|
+ }
|
|
|
+
|
|
|
+ var maxCacheLoadCount = 3;
|
|
|
+ var cachedLoadCount = 0;
|
|
|
+ var baseLoadCount = 0;
|
|
|
+
|
|
|
+ function eventHandler(msg) {
|
|
|
+diff --git a/dom/workers/test/serviceworkers/browser_storage_permission.js.1442465-4_2.later b/dom/workers/test/serviceworkers/browser_storage_permission.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/dom/workers/test/serviceworkers/browser_storage_permission.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,145 @@
|
|
|
++--- browser_storage_permission.js
|
|
|
+++++ browser_storage_permission.js
|
|
|
++@@ -34,51 +34,51 @@ add_task(async function setup() {
|
|
|
++ worker.removeEventListener("statechange", onStateChange);
|
|
|
++ resolve();
|
|
|
++ }
|
|
|
++ });
|
|
|
++ });
|
|
|
++ }
|
|
|
++ );
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function test_allow_permission() {
|
|
|
++ Services.perms.add(Services.io.newURI(PAGE_URI), "cookie",
|
|
|
++ Ci.nsICookiePermission.ACCESS_ALLOW);
|
|
|
++
|
|
|
++ let tab = BrowserTestUtils.addTab(gBrowser, SCOPE);
|
|
|
++ let browser = gBrowser.getBrowserForTab(tab);
|
|
|
++ await BrowserTestUtils.browserLoaded(browser);
|
|
|
++
|
|
|
++ let controller = await ContentTask.spawn(browser, null, async function() {
|
|
|
++ return content.navigator.serviceWorker.controller;
|
|
|
++ });
|
|
|
++
|
|
|
++ ok(!!controller, "page should be controlled with storage allowed");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function test_deny_permission() {
|
|
|
++ Services.perms.add(Services.io.newURI(PAGE_URI), "cookie",
|
|
|
++ Ci.nsICookiePermission.ACCESS_DENY);
|
|
|
++
|
|
|
++ let tab = BrowserTestUtils.addTab(gBrowser, SCOPE);
|
|
|
++ let browser = gBrowser.getBrowserForTab(tab);
|
|
|
++ await BrowserTestUtils.browserLoaded(browser);
|
|
|
++
|
|
|
++ let controller = await ContentTask.spawn(browser, null, async function() {
|
|
|
++ return content.navigator.serviceWorker.controller;
|
|
|
++ });
|
|
|
++
|
|
|
++ is(controller, null, "page should be not controlled with storage denied");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ Services.perms.remove(Services.io.newURI(PAGE_URI), "cookie");
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function test_session_permission() {
|
|
|
++ Services.perms.add(Services.io.newURI(PAGE_URI), "cookie",
|
|
|
++ Ci.nsICookiePermission.ACCESS_SESSION);
|
|
|
++
|
|
|
++ let tab = BrowserTestUtils.addTab(gBrowser, SCOPE);
|
|
|
++@@ -86,17 +86,17 @@ add_task(async function test_session_per
|
|
|
++ await BrowserTestUtils.browserLoaded(browser);
|
|
|
++
|
|
|
++ let controller = await ContentTask.spawn(browser, null, async function() {
|
|
|
++ return content.navigator.serviceWorker.controller;
|
|
|
++ });
|
|
|
++
|
|
|
++ is(controller, null, "page should be not controlled with session storage");
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ Services.perms.remove(Services.io.newURI(PAGE_URI), "cookie");
|
|
|
++ });
|
|
|
++
|
|
|
++ // Test to verify an about:blank iframe successfully inherits the
|
|
|
++ // parent's controller when storage is blocked between opening the
|
|
|
++ // parent page and creating the iframe.
|
|
|
++ add_task(async function test_block_storage_before_blank_iframe() {
|
|
|
++ Services.perms.remove(Services.io.newURI(PAGE_URI), "cookie");
|
|
|
++@@ -129,17 +129,17 @@ add_task(async function test_block_stora
|
|
|
++ content.document.body.appendChild(f);
|
|
|
++ await new Promise(resolve => f.onload = resolve);
|
|
|
++ return !!f.contentWindow.navigator.serviceWorker.controller;
|
|
|
++ });
|
|
|
++
|
|
|
++ ok(!!controller3, "page should be controlled with storage allowed");
|
|
|
++
|
|
|
++ await SpecialPowers.popPrefEnv();
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ // Test to verify a blob URL iframe successfully inherits the
|
|
|
++ // parent's controller when storage is blocked between opening the
|
|
|
++ // parent page and creating the iframe.
|
|
|
++ add_task(async function test_block_storage_before_blob_iframe() {
|
|
|
++ Services.perms.remove(Services.io.newURI(PAGE_URI), "cookie");
|
|
|
++
|
|
|
++@@ -177,17 +177,17 @@ add_task(async function test_block_stora
|
|
|
++ content.document.body.appendChild(f);
|
|
|
++ await new Promise(resolve => f.onload = resolve);
|
|
|
++ return !!f.contentWindow.navigator.serviceWorker.controller;
|
|
|
++ });
|
|
|
++
|
|
|
++ ok(!!controller3, "page should be controlled with storage allowed");
|
|
|
++
|
|
|
++ await SpecialPowers.popPrefEnv();
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ // Test to verify a blob worker script does not hit our service
|
|
|
++ // worker storage assertions when storage is blocked between opening
|
|
|
++ // the parent page and creating the worker. Note, we cannot
|
|
|
++ // explicitly check if the worker is controlled since we don't expose
|
|
|
++ // WorkerNavigator.serviceWorkers.controller yet.
|
|
|
++ add_task(async function test_block_storage_before_blob_worker() {
|
|
|
++@@ -229,17 +229,17 @@ add_task(async function test_block_stora
|
|
|
++ return await new Promise(resolve => {
|
|
|
++ w.onmessage = e => resolve(e.data);
|
|
|
++ });
|
|
|
++ });
|
|
|
++
|
|
|
++ ok(scriptURL2.startsWith("blob:"), "blob URL worker should run");
|
|
|
++
|
|
|
++ await SpecialPowers.popPrefEnv();
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function cleanup() {
|
|
|
++ Services.perms.remove(Services.io.newURI(PAGE_URI), "cookie");
|
|
|
++
|
|
|
++ let tab = BrowserTestUtils.addTab(gBrowser, PAGE_URI);
|
|
|
++ let browser = gBrowser.getBrowserForTab(tab);
|
|
|
++ await BrowserTestUtils.browserLoaded(browser);
|
|
|
++@@ -257,10 +257,10 @@ add_task(async function cleanup() {
|
|
|
++ if (worker.state === "redundant") {
|
|
|
++ worker.removeEventListener("statechange", onStateChange);
|
|
|
++ resolve();
|
|
|
++ }
|
|
|
++ });
|
|
|
++ });
|
|
|
++ });
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/dom/workers/test/serviceworkers/browser_unregister_with_containers.js.1442465-4_2.later b/dom/workers/test/serviceworkers/browser_unregister_with_containers.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/dom/workers/test/serviceworkers/browser_unregister_with_containers.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,62 @@
|
|
|
++--- browser_unregister_with_containers.js
|
|
|
+++++ browser_unregister_with_containers.js
|
|
|
++@@ -84,53 +84,53 @@ add_task(async function test() {
|
|
|
++ await doRegister(containerBrowser1);
|
|
|
++ await doRegister(containerBrowser2);
|
|
|
++
|
|
|
++ await checkUncontrolled(containerBrowser1);
|
|
|
++ await checkUncontrolled(containerBrowser2);
|
|
|
++
|
|
|
++ // Close the tabs we used to register the service workers. These are not
|
|
|
++ // controlled.
|
|
|
++- await BrowserTestUtils.removeTab(containerTab1);
|
|
|
++- await BrowserTestUtils.removeTab(containerTab2);
|
|
|
+++ BrowserTestUtils.removeTab(containerTab1);
|
|
|
+++ BrowserTestUtils.removeTab(containerTab2);
|
|
|
++
|
|
|
++ // Open a controlled tab in each container.
|
|
|
++ containerTab1 = BrowserTestUtils.addTab(gBrowser, SCOPE, { userContextId: 1 });
|
|
|
++ containerBrowser1 = gBrowser.getBrowserForTab(containerTab1);
|
|
|
++ await BrowserTestUtils.browserLoaded(containerBrowser1);
|
|
|
++
|
|
|
++ containerTab2 = BrowserTestUtils.addTab(gBrowser, SCOPE, { userContextId: 2 });
|
|
|
++ containerBrowser2 = gBrowser.getBrowserForTab(containerTab2);
|
|
|
++ await BrowserTestUtils.browserLoaded(containerBrowser2);
|
|
|
++
|
|
|
++ await checkControlled(containerBrowser1);
|
|
|
++ await checkControlled(containerBrowser2);
|
|
|
++
|
|
|
++ // Remove the first container's controlled tab
|
|
|
++- await BrowserTestUtils.removeTab(containerTab1);
|
|
|
+++ BrowserTestUtils.removeTab(containerTab1);
|
|
|
++
|
|
|
++ // Create a new uncontrolled tab for the first container and use it to
|
|
|
++ // unregister the service worker.
|
|
|
++ containerTab1 = BrowserTestUtils.addTab(gBrowser, PAGE_URI, { userContextId: 1 });
|
|
|
++ containerBrowser1 = gBrowser.getBrowserForTab(containerTab1);
|
|
|
++ await BrowserTestUtils.browserLoaded(containerBrowser1);
|
|
|
++ await doUnregister(containerBrowser1);
|
|
|
++
|
|
|
++ await checkUncontrolled(containerBrowser1);
|
|
|
++ await checkControlled(containerBrowser2);
|
|
|
++
|
|
|
++ // Remove the second container's controlled tab
|
|
|
++- await BrowserTestUtils.removeTab(containerTab2);
|
|
|
+++ BrowserTestUtils.removeTab(containerTab2);
|
|
|
++
|
|
|
++ // Create a new uncontrolled tab for the second container and use it to
|
|
|
++ // unregister the service worker.
|
|
|
++ containerTab2 = BrowserTestUtils.addTab(gBrowser, PAGE_URI, { userContextId: 2 });
|
|
|
++ containerBrowser2 = gBrowser.getBrowserForTab(containerTab2);
|
|
|
++ await BrowserTestUtils.browserLoaded(containerBrowser2);
|
|
|
++ await doUnregister(containerBrowser2);
|
|
|
++
|
|
|
++ await checkUncontrolled(containerBrowser1);
|
|
|
++ await checkUncontrolled(containerBrowser2);
|
|
|
++
|
|
|
++ // Close the two tabs we used to unregister the service worker.
|
|
|
++- await BrowserTestUtils.removeTab(containerTab1);
|
|
|
++- await BrowserTestUtils.removeTab(containerTab2);
|
|
|
+++ BrowserTestUtils.removeTab(containerTab1);
|
|
|
+++ BrowserTestUtils.removeTab(containerTab2);
|
|
|
++ });
|
|
|
+diff --git a/dom/workers/test/serviceworkers/browser_userContextId_openWindow.js b/dom/workers/test/serviceworkers/browser_userContextId_openWindow.js
|
|
|
+--- a/dom/workers/test/serviceworkers/browser_userContextId_openWindow.js
|
|
|
++++ b/dom/workers/test/serviceworkers/browser_userContextId_openWindow.js
|
|
|
+@@ -121,11 +121,11 @@ add_task(async function test() {
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ return uci;
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ is(uci, USER_CONTEXT_ID, "Tab runs with UCI " + USER_CONTEXT_ID);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/dom/workers/test/serviceworkers/isolated/multi-e10s-update/browser_multie10s_update.js b/dom/workers/test/serviceworkers/isolated/multi-e10s-update/browser_multie10s_update.js
|
|
|
+--- a/dom/workers/test/serviceworkers/isolated/multi-e10s-update/browser_multie10s_update.js
|
|
|
++++ b/dom/workers/test/serviceworkers/isolated/multi-e10s-update/browser_multie10s_update.js
|
|
|
+@@ -123,11 +123,11 @@ add_task(async function test_update() {
|
|
|
+ // accesss content without using wrappedJSObject.
|
|
|
+ await content.registration.unregister();
|
|
|
+ const { count } =
|
|
|
+ await content.fetch(url + "?get-and-clear-count").then(r => r.json());
|
|
|
+ return count;
|
|
|
+ });
|
|
|
+ is(count, 2, "SW should have been fetched only twice");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+diff --git a/dom/xhr/tests/browser_xhr_onchange_leak.js b/dom/xhr/tests/browser_xhr_onchange_leak.js
|
|
|
+--- a/dom/xhr/tests/browser_xhr_onchange_leak.js
|
|
|
++++ b/dom/xhr/tests/browser_xhr_onchange_leak.js
|
|
|
+@@ -14,10 +14,10 @@ add_task(async function test() {
|
|
|
+ let done = await ContentTask.spawn(browser,{}, async function(browser){
|
|
|
+ let doc = content.document;
|
|
|
+ let promise = ContentTaskUtils.waitForEvent(this, "DOMContentLoaded", true);
|
|
|
+ content.location = "about:home";
|
|
|
+ await promise;
|
|
|
+ return true;
|
|
|
+ });
|
|
|
+ is(done, true, "need to check something");
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ });
|
|
|
+diff --git a/extensions/cookie/test/browser_permmgr_viewsrc.js b/extensions/cookie/test/browser_permmgr_viewsrc.js
|
|
|
+--- a/extensions/cookie/test/browser_permmgr_viewsrc.js
|
|
|
++++ b/extensions/cookie/test/browser_permmgr_viewsrc.js
|
|
|
+@@ -10,10 +10,10 @@ add_task(async function() {
|
|
|
+ /* waitForLoad */ true,
|
|
|
+ /* waitForStateStop */ false,
|
|
|
+ /* forceNewProcess */ true);
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, null, async function() {
|
|
|
+ is(Services.perms.testPermission(Services.io.newURI("http://example.com"),
|
|
|
+ "viewsourceTestingPerm"),
|
|
|
+ Services.perms.ALLOW_ACTION);
|
|
|
+ });
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/extensions/cookie/test/browser_test_favicon.js b/extensions/cookie/test/browser_test_favicon.js
|
|
|
+--- a/extensions/cookie/test/browser_test_favicon.js
|
|
|
++++ b/extensions/cookie/test/browser_test_favicon.js
|
|
|
+@@ -9,14 +9,14 @@ add_task(async function() {
|
|
|
+ let promise = TestUtils.topicObserved("cookie-rejected", subject => {
|
|
|
+ let uri = subject.QueryInterface(Ci.nsIURI);
|
|
|
+ return uri.spec == iconUrl;
|
|
|
+ });
|
|
|
+
|
|
|
+ // Kick off a page load that will load the favicon.
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, pageUrl);
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ await promise;
|
|
|
+ ok(true, "foreign favicon cookie was blocked");
|
|
|
+ });
|
|
|
+diff --git a/js/xpconnect/tests/browser/browser_dead_object.js b/js/xpconnect/tests/browser/browser_dead_object.js
|
|
|
+--- a/js/xpconnect/tests/browser/browser_dead_object.js
|
|
|
++++ b/js/xpconnect/tests/browser/browser_dead_object.js
|
|
|
+@@ -17,10 +17,10 @@ add_task(async function test() {
|
|
|
+ let id = subject.QueryInterface(Ci.nsISupportsPRUint64).data;
|
|
|
+ return id == args.innerWindowId;
|
|
|
+ });
|
|
|
+ content.location = "about:home";
|
|
|
+ await promise;
|
|
|
+ return Cu.isDeadWrapper(doc);
|
|
|
+ });
|
|
|
+ is(contentDocDead, true, "wrapper is dead");
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ });
|
|
|
+diff --git a/layout/base/tests/browser_bug617076.js b/layout/base/tests/browser_bug617076.js
|
|
|
+--- a/layout/base/tests/browser_bug617076.js
|
|
|
++++ b/layout/base/tests/browser_bug617076.js
|
|
|
+@@ -35,12 +35,12 @@ add_task(async function test() {
|
|
|
+ await BrowserTestUtils.synthesizeMouse("#test-button", 1, 1, { type: "mouseover" }, browser);
|
|
|
+ await BrowserTestUtils.synthesizeMouse("#test-button", 2, 6, { type: "mousemove" }, browser);
|
|
|
+ await BrowserTestUtils.synthesizeMouse("#test-button", 2, 4, { type: "mousemove" }, browser);
|
|
|
+ } finally {
|
|
|
+ EventUtils.disableNonTestMouseEvents(false);
|
|
|
+ }
|
|
|
+
|
|
|
+ // cleanup
|
|
|
+- await BrowserTestUtils.removeTab(testTab);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(testTab);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ ok(true, "pass if no assertions");
|
|
|
+ });
|
|
|
+diff --git a/netwerk/test/browser/browser_about_cache.js b/netwerk/test/browser/browser_about_cache.js
|
|
|
+--- a/netwerk/test/browser/browser_about_cache.js
|
|
|
++++ b/netwerk/test/browser/browser_about_cache.js
|
|
|
+@@ -4,17 +4,17 @@
|
|
|
+ * Open a dummy page, then open about:cache and verify the opened page shows up in the cache.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ const kRoot = getRootDirectory(gTestPath).replace("chrome://mochitests/content/",
|
|
|
+ "https://example.com/");
|
|
|
+ const kTestPage = kRoot + "dummy.html";
|
|
|
+ // Open the dummy page to get it cached.
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, kTestPage, true);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:cache", true);
|
|
|
+ let expectedPageCheck = function(uri) {
|
|
|
+ info("Saw load for " + uri);
|
|
|
+ // Can't easily use searchParms and new URL() because it's an about: URI...
|
|
|
+ return uri.startsWith("about:cache?") && uri.includes("storage=disk");
|
|
|
+ };
|
|
|
+ let diskPageLoaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, expectedPageCheck);
|
|
|
+@@ -62,10 +62,10 @@ add_task(async function() {
|
|
|
+ is(principalURI && principalURI.spec, content.document.location.href, "Principal matches location");
|
|
|
+ let channel = content.document.docShell.currentDocumentChannel;
|
|
|
+ principalURI = channel.loadInfo.triggeringPrincipal.URI;
|
|
|
+ is(principalURI && principalURI.spec, triggeringURISpec, "Triggering principal matches previous location");
|
|
|
+ ok(!channel.loadInfo.loadingPrincipal, "Loading principal should be null.");
|
|
|
+ ok(content.document.querySelectorAll("th").length,
|
|
|
+ "Should have several table headers with data.");
|
|
|
+ });
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/parser/htmlparser/tests/mochitest/browser_viewsource.js b/parser/htmlparser/tests/mochitest/browser_viewsource.js
|
|
|
+--- a/parser/htmlparser/tests/mochitest/browser_viewsource.js
|
|
|
++++ b/parser/htmlparser/tests/mochitest/browser_viewsource.js
|
|
|
+@@ -12,11 +12,11 @@ add_task(async function() {
|
|
|
+ });
|
|
|
+
|
|
|
+ let viewSourceContentPromise = ContentTask.spawn(viewSourceTab.linkedBrowser, null, async function() {
|
|
|
+ return content.document.body.textContent;
|
|
|
+ });
|
|
|
+
|
|
|
+ let results = await Promise.all([viewSourceContentPromise, xhrPromise]);
|
|
|
+ is(results[0], results[1], "Sources should match");
|
|
|
+- await BrowserTestUtils.removeTab(viewSourceTab);
|
|
|
++ BrowserTestUtils.removeTab(viewSourceTab);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/services/fxaccounts/tests/browser/browser_device_connected.js b/services/fxaccounts/tests/browser/browser_device_connected.js
|
|
|
+--- a/services/fxaccounts/tests/browser/browser_device_connected.js
|
|
|
++++ b/services/fxaccounts/tests/browser/browser_device_connected.js
|
|
|
+@@ -31,17 +31,17 @@ async function testDeviceConnected(devic
|
|
|
+
|
|
|
+ Services.obs.notifyObservers(null, "fxaccounts:device_connected", deviceName);
|
|
|
+
|
|
|
+ let tab = await waitForTabPromise;
|
|
|
+ Assert.ok("Tab successfully opened");
|
|
|
+
|
|
|
+ Assert.equal(tab.linkedBrowser.currentURI.spec, DEVICES_URL);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ expectedBody = accountsBundle.formatStringFromName("deviceConnectedBody", ["My phone"], 1);
|
|
|
+ await testDeviceConnected("My phone");
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+diff --git a/services/fxaccounts/tests/browser/browser_verify_login.js b/services/fxaccounts/tests/browser/browser_verify_login.js
|
|
|
+--- a/services/fxaccounts/tests/browser/browser_verify_login.js
|
|
|
++++ b/services/fxaccounts/tests/browser/browser_verify_login.js
|
|
|
+@@ -19,10 +19,10 @@ add_task(async function() {
|
|
|
+
|
|
|
+ let waitForTabPromise = BrowserTestUtils.waitForNewTab(gBrowser);
|
|
|
+
|
|
|
+ Services.obs.notifyObservers(null, "fxaccounts:verify_login", JSON.stringify(payload.data));
|
|
|
+
|
|
|
+ let tab = await waitForTabPromise;
|
|
|
+ Assert.ok("Tab successfully opened");
|
|
|
+ Assert.equal(tab.linkedBrowser.currentURI.spec, payload.data.url);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/testing/mochitest/tests/browser/browser_BrowserTestUtils.js b/testing/mochitest/tests/browser/browser_BrowserTestUtils.js
|
|
|
+--- a/testing/mochitest/tests/browser/browser_BrowserTestUtils.js
|
|
|
++++ b/testing/mochitest/tests/browser/browser_BrowserTestUtils.js
|
|
|
+@@ -50,17 +50,17 @@ add_task(async function() {
|
|
|
+
|
|
|
+ add_task(async function() {
|
|
|
+ await BrowserTestUtils.registerAboutPage(
|
|
|
+ registerCleanupFunction, "about-pages-are-cool",
|
|
|
+ getRootDirectory(gTestPath) + "dummy.html", 0);
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(
|
|
|
+ gBrowser, "about:about-pages-are-cool", true);
|
|
|
+ ok(tab, "Successfully created an about: page and loaded it.");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ try {
|
|
|
+ await BrowserTestUtils.unregisterAboutPage("about-pages-are-cool");
|
|
|
+ ok(true, "Successfully unregistered the about page.");
|
|
|
+ } catch (ex) {
|
|
|
+ ok(false, "Should not throw unregistering a known about: page");
|
|
|
+ }
|
|
|
+ await BrowserTestUtils.unregisterAboutPage("random-other-about-page").then(() => {
|
|
|
+ ok(false, "Should not have succeeded unregistering an unknown about: page.");
|
|
|
+diff --git a/toolkit/components/aboutperformance/tests/browser/browser_aboutperformance.js b/toolkit/components/aboutperformance/tests/browser/browser_aboutperformance.js
|
|
|
+--- a/toolkit/components/aboutperformance/tests/browser/browser_aboutperformance.js
|
|
|
++++ b/toolkit/components/aboutperformance/tests/browser/browser_aboutperformance.js
|
|
|
+@@ -282,27 +282,27 @@ add_task(async function test_close_tab()
|
|
|
+ } while (true);
|
|
|
+
|
|
|
+ if (mode == "close") {
|
|
|
+ info(`Waiting for close`);
|
|
|
+ await promiseClosed;
|
|
|
+ } else {
|
|
|
+ info(`Waiting for reload`);
|
|
|
+ await promiseReloaded;
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function cleanup() {
|
|
|
+ // Cleanup
|
|
|
+ info("Cleaning up");
|
|
|
+ await promiseContentResponse(gTabAboutPerformance.linkedBrowser, "aboutperformance-test:done", null);
|
|
|
+
|
|
|
+ info("Closing tabs");
|
|
|
+ for (let tab of gBrowser.tabs) {
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ info("Done");
|
|
|
+ gBrowser.selectedTab = null;
|
|
|
+ });
|
|
|
+diff --git a/toolkit/components/passwordmgr/test/browser/browser_autocomplete_insecure_warning.js b/toolkit/components/passwordmgr/test/browser/browser_autocomplete_insecure_warning.js
|
|
|
+--- a/toolkit/components/passwordmgr/test/browser/browser_autocomplete_insecure_warning.js
|
|
|
++++ b/toolkit/components/passwordmgr/test/browser/browser_autocomplete_insecure_warning.js
|
|
|
+@@ -31,11 +31,11 @@ add_task(async function test_clickInsecu
|
|
|
+
|
|
|
+ await BrowserTestUtils.waitForCondition(() => !warningItem.collapsed, "Wait for warning to show");
|
|
|
+
|
|
|
+ info("Clicking on warning");
|
|
|
+ let supportTabPromise = BrowserTestUtils.waitForNewTab(gBrowser, EXPECTED_SUPPORT_URL);
|
|
|
+ EventUtils.synthesizeMouseAtCenter(warningItem, {});
|
|
|
+ let supportTab = await supportTabPromise;
|
|
|
+ ok(supportTab, "Support tab opened");
|
|
|
+- await BrowserTestUtils.removeTab(supportTab);
|
|
|
++ BrowserTestUtils.removeTab(supportTab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger_window_open.js b/toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger_window_open.js
|
|
|
+--- a/toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger_window_open.js
|
|
|
++++ b/toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger_window_open.js
|
|
|
+@@ -97,17 +97,17 @@ add_task(async function test_saveChromeV
|
|
|
+ let url = "subtst_notifications_11.html?notifyu2|notifyp2||";
|
|
|
+ let notifShownPromise = BrowserTestUtils.waitForEvent(PopupNotifications.panel, "popupshown");
|
|
|
+ await withTestTabUntilStorageChange(url, async function() {
|
|
|
+ await notifShownPromise;
|
|
|
+ let popup = getCaptureDoorhanger("password-save");
|
|
|
+ ok(popup, "got notification popup");
|
|
|
+ await checkDoorhangerUsernamePassword("notifyu2", "notifyp2");
|
|
|
+ clickDoorhangerButton(popup, REMEMBER_BUTTON);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Check result of clicking Remember
|
|
|
+ let logins = Services.logins.getAllLogins();
|
|
|
+ is(logins.length, 1, "Should only have 1 login now");
|
|
|
+ let login = logins[0].QueryInterface(Ci.nsILoginMetaInfo);
|
|
|
+ is(login.username, "notifyu2", "Check the username used on the new entry");
|
|
|
+ is(login.password, "notifyp2", "Check the password used on the new entry");
|
|
|
+@@ -118,17 +118,17 @@ add_task(async function test_changeChrom
|
|
|
+ let url = "subtst_notifications_11.html?notifyu2|pass2||";
|
|
|
+ let notifShownPromise = BrowserTestUtils.waitForEvent(PopupNotifications.panel, "popupshown");
|
|
|
+ await withTestTabUntilStorageChange(url, async function() {
|
|
|
+ await notifShownPromise;
|
|
|
+ let popup = getCaptureDoorhanger("password-change");
|
|
|
+ ok(popup, "got notification popup");
|
|
|
+ await checkDoorhangerUsernamePassword("notifyu2", "pass2");
|
|
|
+ clickDoorhangerButton(popup, CHANGE_BUTTON);
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Check to make sure we updated the password, timestamps and use count for
|
|
|
+ // the login being changed with this form.
|
|
|
+ let logins = Services.logins.getAllLogins();
|
|
|
+ is(logins.length, 1, "Should have 1 login");
|
|
|
+ let login = logins[0].QueryInterface(Ci.nsILoginMetaInfo);
|
|
|
+ is(login.username, "notifyu2", "Check the username");
|
|
|
+diff --git a/toolkit/components/passwordmgr/test/browser/browser_hasInsecureLoginForms_streamConverter.js b/toolkit/components/passwordmgr/test/browser/browser_hasInsecureLoginForms_streamConverter.js
|
|
|
+--- a/toolkit/components/passwordmgr/test/browser/browser_hasInsecureLoginForms_streamConverter.js
|
|
|
++++ b/toolkit/components/passwordmgr/test/browser/browser_hasInsecureLoginForms_streamConverter.js
|
|
|
+@@ -89,14 +89,14 @@ add_task(async function test_streamConve
|
|
|
+ BrowserTestUtils.switchTab(gBrowser, tab),
|
|
|
+ BrowserTestUtils.browserLoaded(browser),
|
|
|
+ // One event is triggered by pageshow and one by DOMFormHasPassword.
|
|
|
+ waitForInsecureLoginFormsStateChange(browser, 2),
|
|
|
+ ]);
|
|
|
+
|
|
|
+ Assert.ok(!LoginManagerParent.hasInsecureLoginForms(browser));
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ await ContentTask.spawn(originalBrowser, null, async function() {
|
|
|
+ this.cleanupFunction();
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/toolkit/components/places/tests/browser/browser_bug399606.js b/toolkit/components/places/tests/browser/browser_bug399606.js
|
|
|
+--- a/toolkit/components/places/tests/browser/browser_bug399606.js
|
|
|
++++ b/toolkit/components/places/tests/browser/browser_bug399606.js
|
|
|
+@@ -39,17 +39,17 @@ add_task(async function() {
|
|
|
+ historyObserver.expectedURI = Services.io.newURI(uri);
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
|
|
|
+ PlacesUtils.history.addObserver(historyObserver);
|
|
|
+ gBrowser.loadURI(uri);
|
|
|
+ await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false, uri);
|
|
|
+ await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false, uri);
|
|
|
+ await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false, uri);
|
|
|
+ PlacesUtils.history.removeObserver(historyObserver);
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ for (let uri of URIS) {
|
|
|
+ await promiseLoadedThreeTimes(uri);
|
|
|
+ is(historyObserver.count, 1,
|
|
|
+ "onVisit has been received right number of times for " + uri);
|
|
|
+ }
|
|
|
+ });
|
|
|
+diff --git a/toolkit/components/places/tests/browser/browser_bug680727.js b/toolkit/components/places/tests/browser/browser_bug680727.js
|
|
|
+--- a/toolkit/components/places/tests/browser/browser_bug680727.js
|
|
|
++++ b/toolkit/components/places/tests/browser/browser_bug680727.js
|
|
|
+@@ -98,10 +98,10 @@ function reloadListener() {
|
|
|
+ function reloadAsyncListener(aURI, aIsVisited) {
|
|
|
+ ok(kUniqueURI.equals(aURI) && aIsVisited, "We have visited the URI.");
|
|
|
+ PlacesTestUtils.clearHistory().then(finish);
|
|
|
+ }
|
|
|
+
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+ Services.prefs.setIntPref("network.proxy.type", proxyPrefValue);
|
|
|
+ Services.io.offline = false;
|
|
|
+- await BrowserTestUtils.removeTab(ourTab);
|
|
|
++ BrowserTestUtils.removeTab(ourTab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/components/places/tests/browser/browser_multi_redirect_frecency.js.1442465-4_2.later b/toolkit/components/places/tests/browser/browser_multi_redirect_frecency.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/toolkit/components/places/tests/browser/browser_multi_redirect_frecency.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,52 @@
|
|
|
++--- browser_multi_redirect_frecency.js
|
|
|
+++++ browser_multi_redirect_frecency.js
|
|
|
++@@ -57,17 +57,17 @@ add_task(async function test_multiple_re
|
|
|
++ await visitedPromise;
|
|
|
++ ok(redirectNotified, "The redirect should have been notified");
|
|
|
++
|
|
|
++ await check_uri(REDIRECT_URI, redirectSourceFrecency, 1);
|
|
|
++ await check_uri(INTERMEDIATE_URI_1, redirectSourceFrecency, 1);
|
|
|
++ await check_uri(INTERMEDIATE_URI_2, redirectSourceFrecency, 1);
|
|
|
++ await check_uri(TARGET_URI, redirectTargetFrecency, 0);
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function redirect_check_second_typed_visit() {
|
|
|
++ // A second visit with a typed url.
|
|
|
++ PlacesUtils.history.markPageAsTyped(REDIRECT_URI);
|
|
|
++
|
|
|
++ redirectSourceFrecency += REDIRECT_SOURCE_VISIT_BONUS;
|
|
|
++ // TODO Bug 487813 - This should be TYPED_VISIT_BONUS, however as we don't
|
|
|
++@@ -91,17 +91,17 @@ add_task(async function redirect_check_s
|
|
|
++ await visitedPromise;
|
|
|
++ ok(redirectNotified, "The redirect should have been notified");
|
|
|
++
|
|
|
++ await check_uri(REDIRECT_URI, redirectSourceFrecency, 1);
|
|
|
++ await check_uri(INTERMEDIATE_URI_1, redirectSourceFrecency, 1);
|
|
|
++ await check_uri(INTERMEDIATE_URI_2, redirectSourceFrecency, 1);
|
|
|
++ await check_uri(TARGET_URI, redirectTargetFrecency, 0);
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++
|
|
|
++ add_task(async function redirect_check_subsequent_link_visit() {
|
|
|
++ // Another visit, but this time as a visited url.
|
|
|
++ redirectSourceFrecency += REDIRECT_SOURCE_VISIT_BONUS;
|
|
|
++ // TODO Bug 487813 - This should be TYPED_VISIT_BONUS, however as we don't
|
|
|
++ // currently track redirects across multiple redirects, we fallback to the
|
|
|
++@@ -124,10 +124,10 @@ add_task(async function redirect_check_s
|
|
|
++ await visitedPromise;
|
|
|
++ ok(redirectNotified, "The redirect should have been notified");
|
|
|
++
|
|
|
++ await check_uri(REDIRECT_URI, redirectSourceFrecency, 1);
|
|
|
++ await check_uri(INTERMEDIATE_URI_1, redirectSourceFrecency, 1);
|
|
|
++ await check_uri(INTERMEDIATE_URI_2, redirectSourceFrecency, 1);
|
|
|
++ await check_uri(TARGET_URI, redirectTargetFrecency, 0);
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/toolkit/components/places/tests/browser/browser_onvisit_title_null_for_navigation.js b/toolkit/components/places/tests/browser/browser_onvisit_title_null_for_navigation.js
|
|
|
+--- a/toolkit/components/places/tests/browser/browser_onvisit_title_null_for_navigation.js
|
|
|
++++ b/toolkit/components/places/tests/browser/browser_onvisit_title_null_for_navigation.js
|
|
|
+@@ -19,10 +19,10 @@ add_task(async function checkTitleNotifi
|
|
|
+ resolve();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ };
|
|
|
+ PlacesUtils.history.addObserver(obs);
|
|
|
+ });
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, EXPECTED_URL.spec);
|
|
|
+ await promiseTitleChanged;
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/components/places/tests/browser/browser_redirect.js.1442465-4_2.later b/toolkit/components/places/tests/browser/browser_redirect.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/toolkit/components/places/tests/browser/browser_redirect.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,52 @@
|
|
|
++--- browser_redirect.js
|
|
|
+++++ browser_redirect.js
|
|
|
++@@ -52,17 +52,17 @@ add_task(async function redirect_check_n
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, REDIRECT_URI.spec);
|
|
|
++ info("Waiting for onVisits");
|
|
|
++ await visitedPromise;
|
|
|
++ ok(redirectNotified, "The redirect should have been notified");
|
|
|
++
|
|
|
++ await check_uri(REDIRECT_URI, redirectSourceFrecency, 1);
|
|
|
++ await check_uri(TARGET_URI, redirectTargetFrecency, 0);
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function redirect_check_second_typed_visit() {
|
|
|
++ // A second visit with a typed url.
|
|
|
++ PlacesUtils.history.markPageAsTyped(REDIRECT_URI);
|
|
|
++
|
|
|
++ redirectSourceFrecency += REDIRECT_SOURCE_VISIT_BONUS;
|
|
|
++ redirectTargetFrecency += TYPED_VISIT_BONUS;
|
|
|
++@@ -81,17 +81,17 @@ add_task(async function redirect_check_s
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, REDIRECT_URI.spec);
|
|
|
++ info("Waiting for onVisits");
|
|
|
++ await visitedPromise;
|
|
|
++ ok(redirectNotified, "The redirect should have been notified");
|
|
|
++
|
|
|
++ await check_uri(REDIRECT_URI, redirectSourceFrecency, 1);
|
|
|
++ await check_uri(TARGET_URI, redirectTargetFrecency, 0);
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
++
|
|
|
++ add_task(async function redirect_check_subsequent_link_visit() {
|
|
|
++ // Another visit, but this time as a visited url.
|
|
|
++ redirectSourceFrecency += REDIRECT_SOURCE_VISIT_BONUS;
|
|
|
++ redirectTargetFrecency += LINK_VISIT_BONUS;
|
|
|
++ let redirectNotified = false;
|
|
|
++
|
|
|
++@@ -108,10 +108,10 @@ add_task(async function redirect_check_s
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, REDIRECT_URI.spec);
|
|
|
++ info("Waiting for onVisits");
|
|
|
++ await visitedPromise;
|
|
|
++ ok(redirectNotified, "The redirect should have been notified");
|
|
|
++
|
|
|
++ await check_uri(REDIRECT_URI, redirectSourceFrecency, 1);
|
|
|
++ await check_uri(TARGET_URI, redirectTargetFrecency, 0);
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ });
|
|
|
+diff --git a/toolkit/components/places/tests/browser/browser_visited_notfound.js b/toolkit/components/places/tests/browser/browser_visited_notfound.js
|
|
|
+--- a/toolkit/components/places/tests/browser/browser_visited_notfound.js
|
|
|
++++ b/toolkit/components/places/tests/browser/browser_visited_notfound.js
|
|
|
+@@ -1,17 +1,17 @@
|
|
|
+ add_task(async function test() {
|
|
|
+ const TEST_URL = "http://mochi.test:8888/notFoundPage.html";
|
|
|
+ // Ensure that decay frecency doesn't kick in during tests (as a result
|
|
|
+ // of idle-daily).
|
|
|
+ Services.prefs.setCharPref("places.frecency.decayRate", "1.0");
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
|
|
|
+ registerCleanupFunction(async function() {
|
|
|
+ Services.prefs.clearUserPref("places.frecency.decayRate");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ await PlacesTestUtils.clearHistory();
|
|
|
+ });
|
|
|
+
|
|
|
+ // First add a visit to the page, this will ensure that later we skip
|
|
|
+ // updating the frecency for a newly not-found page.
|
|
|
+ await PlacesTestUtils.addVisits({ uri: TEST_URL });
|
|
|
+ let frecency = await PlacesTestUtils.fieldInDB(TEST_URL, "frecency");
|
|
|
+ is(frecency, 100, "Check initial frecency");
|
|
|
+diff --git a/toolkit/components/printing/tests/browser_page_change_print_original.js b/toolkit/components/printing/tests/browser_page_change_print_original.js
|
|
|
+--- a/toolkit/components/printing/tests/browser_page_change_print_original.js
|
|
|
++++ b/toolkit/components/printing/tests/browser_page_change_print_original.js
|
|
|
+@@ -54,10 +54,10 @@ add_task(async function pp_after_orienta
|
|
|
+
|
|
|
+ // Check that the other tab is definitely showing the new page:
|
|
|
+ await ContentTask.spawn(browserToPrint, null, async function() {
|
|
|
+ is(content.document.body.textContent.trim(), "REPLACED PAGE!", "Original page should have changed.");
|
|
|
+ });
|
|
|
+
|
|
|
+ PrintUtils.exitPrintPreview();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/components/printing/tests/browser_preview_switch_print_selected.js b/toolkit/components/printing/tests/browser_preview_switch_print_selected.js
|
|
|
+--- a/toolkit/components/printing/tests/browser_preview_switch_print_selected.js
|
|
|
++++ b/toolkit/components/printing/tests/browser_preview_switch_print_selected.js
|
|
|
+@@ -95,10 +95,10 @@ add_task(async function switch_print_pre
|
|
|
+ // Assert that we are selecting default print preview browser, and not simplified one
|
|
|
+ is(gBrowser.selectedTab.linkedBrowser, defaultPPBrowser,
|
|
|
+ "Should have default print preview browser selected");
|
|
|
+ isnot(gBrowser.selectedTab.linkedBrowser, simplifiedPPBrowser,
|
|
|
+ "Should not have simplified print preview browser selected");
|
|
|
+
|
|
|
+ PrintUtils.exitPrintPreview();
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/components/tooltiptext/tests/browser_input_file_tooltips.js b/toolkit/components/tooltiptext/tests/browser_input_file_tooltips.js
|
|
|
+--- a/toolkit/components/tooltiptext/tests/browser_input_file_tooltips.js
|
|
|
++++ b/toolkit/components/tooltiptext/tests/browser_input_file_tooltips.js
|
|
|
+@@ -97,17 +97,17 @@ async function do_test(test) {
|
|
|
+ info("Second mouse move");
|
|
|
+ await EventUtils.synthesizeAndWaitNativeMouseMove(tab.linkedBrowser, 70, 5);
|
|
|
+ info("Waiting for tooltip to open");
|
|
|
+ let tooltip = await awaitTooltipOpen;
|
|
|
+
|
|
|
+ is(tooltip.getAttribute("label"), test.result, "tooltip label should match expectation");
|
|
|
+
|
|
|
+ info("Closing tab");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ function createTempFile() {
|
|
|
+ let file = FileUtils.getDir("TmpD", [], false);
|
|
|
+ file.append("testfile_bug1251809");
|
|
|
+ file.create(Ci.nsIFile.NORMAL_FILE_TYPE, 0o644);
|
|
|
+ return file;
|
|
|
+ }
|
|
|
+diff --git a/toolkit/components/viewsource/test/browser/browser_open_docgroup.js b/toolkit/components/viewsource/test/browser/browser_open_docgroup.js
|
|
|
+--- a/toolkit/components/viewsource/test/browser/browser_open_docgroup.js
|
|
|
++++ b/toolkit/components/viewsource/test/browser/browser_open_docgroup.js
|
|
|
+@@ -32,17 +32,17 @@ add_task(async function test_view_source
|
|
|
+ let sourceBrowser = sourceTab.linkedBrowser;
|
|
|
+ await waitForSourceLoaded(sourceBrowser);
|
|
|
+
|
|
|
+ await ContentTask.spawn(sourceBrowser, null, async function() {
|
|
|
+ Assert.equal(content.document.body.id, "viewsource",
|
|
|
+ "View source mode enabled");
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(sourceTab);
|
|
|
++ BrowserTestUtils.removeTab(sourceTab);
|
|
|
+ });
|
|
|
+
|
|
|
+ await SpecialPowers.popPrefEnv();
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Tests that we can open View Source in a window.
|
|
|
+ */
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_audioCompeting.js b/toolkit/content/tests/browser/browser_audioCompeting.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_audioCompeting.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_audioCompeting.js
|
|
|
+@@ -73,28 +73,28 @@ add_task(async function cross_tabs_audio
|
|
|
+ await ContentTask.spawn(tab2.linkedBrowser, null,
|
|
|
+ audio_should_keep_playing_even_go_to_background);
|
|
|
+
|
|
|
+ info("- play audio from background tab 1 -");
|
|
|
+ await ContentTask.spawn(tab1.linkedBrowser, null,
|
|
|
+ play_audio_from_invisible_tab);
|
|
|
+
|
|
|
+ info("- remove tabs -");
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
+- await BrowserTestUtils.removeTab(tab3);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab3);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function within_one_tab_audio_competing() {
|
|
|
+ info("- open tab and play audio1 -");
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(window.gBrowser,
|
|
|
+ "about:blank");
|
|
|
+ tab.linkedBrowser.loadURI(PAGE);
|
|
|
+ await waitForTabPlayingEvent(tab, true);
|
|
|
+
|
|
|
+ info("- play audio2 in the same tab -");
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, null,
|
|
|
+ play_non_autoplay_audio);
|
|
|
+
|
|
|
+ info("- remove tab -");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_autoplay_policy_iframe_hierarchy.js b/toolkit/content/tests/browser/browser_autoplay_policy_iframe_hierarchy.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_autoplay_policy_iframe_hierarchy.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_autoplay_policy_iframe_hierarchy.js
|
|
|
+@@ -139,17 +139,17 @@ async function test_permission_propagati
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser,
|
|
|
+ [layerIdx, testName, layersNum],
|
|
|
+ playing_video_may_success);
|
|
|
+
|
|
|
+ info("- remove tab -");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function start_test() {
|
|
|
+ info("- setup test preference -");
|
|
|
+ await setup_test_preference();
|
|
|
+ requestLongerTimeout(2);
|
|
|
+
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_autoplay_policy_play_twice.js b/toolkit/content/tests/browser/browser_autoplay_policy_play_twice.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_autoplay_policy_play_twice.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_autoplay_policy_play_twice.js
|
|
|
+@@ -31,17 +31,17 @@ async function allow_play_for_played_vid
|
|
|
+ try {
|
|
|
+ await video.play();
|
|
|
+ ok(true, "success to resolve play promise");
|
|
|
+ } catch (e) {
|
|
|
+ ok(false, "promise should not be rejected");
|
|
|
+ }
|
|
|
+
|
|
|
+ info("- remove tab -");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ }
|
|
|
+
|
|
|
+ add_task(async function start_test() {
|
|
|
+ await setup_test_preference(true);
|
|
|
+ await allow_play_for_played_video();
|
|
|
+
|
|
|
+ await setup_test_preference(false);
|
|
|
+ await allow_play_for_played_video();
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_autoplay_policy_user_gestures.js.1442465-4_2.later b/toolkit/content/tests/browser/browser_autoplay_policy_user_gestures.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/toolkit/content/tests/browser/browser_autoplay_policy_user_gestures.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,40 @@
|
|
|
++--- browser_autoplay_policy_user_gestures.js
|
|
|
+++++ browser_autoplay_policy_user_gestures.js
|
|
|
++@@ -66,17 +66,17 @@ async function test_play_without_user_ge
|
|
|
++ info("- call play() without user activation -");
|
|
|
++ await video.play().catch(function() {
|
|
|
++ ok(video.paused, "video can't start play without user input.");
|
|
|
++ });
|
|
|
++ }
|
|
|
++ await ContentTask.spawn(tab.linkedBrowser, null, play_video);
|
|
|
++
|
|
|
++ info("- remove tab -");
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ }
|
|
|
++
|
|
|
++ async function test_play_with_user_gesture(gesture) {
|
|
|
++ info("- open new tab -");
|
|
|
++ let tab = await BrowserTestUtils.openNewForegroundTab(window.gBrowser,
|
|
|
++ "about:blank");
|
|
|
++ tab.linkedBrowser.loadURI(VIDEO_PAGE);
|
|
|
++ await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
|
|
|
++@@ -94,17 +94,17 @@ async function test_play_with_user_gestu
|
|
|
++ } catch (e) {
|
|
|
++ ok(!gesture.isActivationGesture, "user gesture can not activate the page");
|
|
|
++ ok(video.paused, "video can not start playing.");
|
|
|
++ }
|
|
|
++ }
|
|
|
++ await ContentTask.spawn(tab.linkedBrowser, gesture, play_video);
|
|
|
++
|
|
|
++ info("- remove tab -");
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++ }
|
|
|
++
|
|
|
++ add_task(async function start_test() {
|
|
|
++ info("- setup test preference -");
|
|
|
++ await setup_test_preference();
|
|
|
++
|
|
|
++ info("- test play when page doesn't be activated -");
|
|
|
++ await test_play_without_user_gesture();
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_block_autoplay_media.js b/toolkit/content/tests/browser/browser_block_autoplay_media.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_block_autoplay_media.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_block_autoplay_media.js
|
|
|
+@@ -60,12 +60,12 @@ add_task(async function block_autoplay_m
|
|
|
+ check_audio_suspended);
|
|
|
+
|
|
|
+ info("- should still block media from tab2 -");
|
|
|
+ await waitForTabPlayingEvent(tab2, false);
|
|
|
+ await ContentTask.spawn(tab2.linkedBrowser, SuspendedType.SUSPENDED_BLOCK,
|
|
|
+ check_audio_suspended);
|
|
|
+
|
|
|
+ info("- remove tabs -");
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
+- await BrowserTestUtils.removeTab(tab3);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab3);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_block_autoplay_media_pausedAfterPlay.js b/toolkit/content/tests/browser/browser_block_autoplay_media_pausedAfterPlay.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_block_autoplay_media_pausedAfterPlay.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_block_autoplay_media_pausedAfterPlay.js
|
|
|
+@@ -73,11 +73,11 @@ add_task(async function block_autoplay_m
|
|
|
+ await ContentTask.spawn(tab2.linkedBrowser, false,
|
|
|
+ check_audio_pause_state);
|
|
|
+
|
|
|
+ info("- check tab2's media suspend type -");
|
|
|
+ await ContentTask.spawn(tab2.linkedBrowser, SuspendedType.NONE_SUSPENDED,
|
|
|
+ check_audio_suspended);
|
|
|
+
|
|
|
+ info("- remove tabs -");
|
|
|
+- await BrowserTestUtils.removeTab(tab1);
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab1);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_block_autoplay_playAfterTabVisible.js b/toolkit/content/tests/browser/browser_block_autoplay_playAfterTabVisible.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_block_autoplay_playAfterTabVisible.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_block_autoplay_playAfterTabVisible.js
|
|
|
+@@ -75,10 +75,10 @@ add_task(async function media_should_be_
|
|
|
+
|
|
|
+ info("- audio should be playing -");
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, false,
|
|
|
+ check_audio_pause_state);
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, SuspendedType.NONE_SUSPENDED,
|
|
|
+ check_audio_suspended);
|
|
|
+
|
|
|
+ info("- remove tab -");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_block_multipleMedia.js b/toolkit/content/tests/browser/browser_block_multipleMedia.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_block_multipleMedia.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_block_multipleMedia.js
|
|
|
+@@ -112,10 +112,10 @@ add_task(async function block_multiple_m
|
|
|
+ await BrowserTestUtils.switchTab(window.gBrowser, tab);
|
|
|
+
|
|
|
+ info("- tab should be resumed -");
|
|
|
+ await waitForTabPlayingEvent(tab, true);
|
|
|
+ await ContentTask.spawn(browser, SuspendedType.NONE_SUSPENDED,
|
|
|
+ check_all_audio_suspended);
|
|
|
+
|
|
|
+ info("- remove tab -");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_block_notInTreeAudio.js b/toolkit/content/tests/browser/browser_block_notInTreeAudio.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_block_notInTreeAudio.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_block_notInTreeAudio.js
|
|
|
+@@ -79,10 +79,10 @@ add_task(async function block_not_in_tre
|
|
|
+
|
|
|
+ info("- tab should be resumed -");
|
|
|
+ await waitForTabBlockEvent(tab, false);
|
|
|
+
|
|
|
+ info("- tab should be audible -");
|
|
|
+ await waitForTabPlayingEvent(tab, true);
|
|
|
+
|
|
|
+ info("- remove tab -");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_block_playMediaInMuteTab.js b/toolkit/content/tests/browser/browser_block_playMediaInMuteTab.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_block_playMediaInMuteTab.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_block_playMediaInMuteTab.js
|
|
|
+@@ -105,10 +105,10 @@ add_task(async function unblock_icon_sho
|
|
|
+ check_audio_suspended);
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, true /* mute */,
|
|
|
+ check_audio_volume_and_mute);
|
|
|
+
|
|
|
+ info("- tab should not display unblocking icon -");
|
|
|
+ await waitForTabBlockEvent(tab, false);
|
|
|
+
|
|
|
+ info("- remove tab -");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_block_silentAudioTrack_media.js b/toolkit/content/tests/browser/browser_block_silentAudioTrack_media.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_block_silentAudioTrack_media.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_block_silentAudioTrack_media.js
|
|
|
+@@ -54,17 +54,17 @@ add_task(async function unblock_icon_sho
|
|
|
+
|
|
|
+ info("- should not display unblocking icon -");
|
|
|
+ await waitForTabBlockEvent(tab, false);
|
|
|
+
|
|
|
+ info("- should not display sound indicator icon -");
|
|
|
+ await waitForTabPlayingEvent(tab, false);
|
|
|
+
|
|
|
+ info("- remove tab -");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function should_not_show_sound_indicator_after_resume_tab() {
|
|
|
+ info("- open new background tab -");
|
|
|
+ let tab = window.gBrowser.addTab("about:blank");
|
|
|
+ tab.linkedBrowser.loadURI(PAGE);
|
|
|
+ await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
|
|
|
+
|
|
|
+@@ -84,10 +84,10 @@ add_task(async function should_not_show_
|
|
|
+
|
|
|
+ info("- should not display unblocking icon -");
|
|
|
+ await waitForTabBlockEvent(tab, false);
|
|
|
+
|
|
|
+ info("- should not display sound indicator icon -");
|
|
|
+ await waitForTabPlayingEvent(tab, false);
|
|
|
+
|
|
|
+ info("- remove tab -");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_block_webAudio.js b/toolkit/content/tests/browser/browser_block_webAudio.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_block_webAudio.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_block_webAudio.js
|
|
|
+@@ -28,10 +28,10 @@ add_task(async function block_web_audio(
|
|
|
+
|
|
|
+ info("- tab should be resumed -");
|
|
|
+ await waitForTabBlockEvent(tab, false);
|
|
|
+
|
|
|
+ info("- tab should be audible -");
|
|
|
+ await waitForTabPlayingEvent(tab, true);
|
|
|
+
|
|
|
+ info("- remove tab -");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_bug1198465.js b/toolkit/content/tests/browser/browser_bug1198465.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_bug1198465.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_bug1198465.js
|
|
|
+@@ -66,10 +66,10 @@ add_task(async function() {
|
|
|
+ is(findBar._findField.value, "ab", "ab kept instead of prefill value");
|
|
|
+
|
|
|
+ EventUtils.sendChar("c", window);
|
|
|
+ is(findBar._findField.value, "abc", "c is appended after ab");
|
|
|
+
|
|
|
+ // Clear the findField value to make the test run successfully
|
|
|
+ // for multiple runs in the same browser session.
|
|
|
+ findBar._findField.value = "";
|
|
|
+- await BrowserTestUtils.removeTab(aTab);
|
|
|
++ BrowserTestUtils.removeTab(aTab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_bug451286.js b/toolkit/content/tests/browser/browser_bug451286.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_bug451286.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_bug451286.js
|
|
|
+@@ -96,17 +96,17 @@ add_task(async function() {
|
|
|
+ // Test 1: Were the matches in iframe correctly highlighted?
|
|
|
+ let res = compareSnapshots(findSnapshot, manualSnapshot, true);
|
|
|
+ ok(res[0], "Matches found in iframe correctly highlighted");
|
|
|
+
|
|
|
+ // Test 2: Were the matches in iframe correctly unhighlighted?
|
|
|
+ res = compareSnapshots(noHighlightSnapshot, unhighlightSnapshot, true);
|
|
|
+ ok(res[0], "Highlighting in iframe correctly removed");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ function toggleHighlightAndWait(shouldHighlight) {
|
|
|
+ return new Promise((resolve) => {
|
|
|
+ let listener = {
|
|
|
+ onFindResult() {},
|
|
|
+ onHighlightFinished() {
|
|
|
+ gFindBar.browser.finder.removeResultListener(listener);
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_bug594509.js b/toolkit/content/tests/browser/browser_bug594509.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_bug594509.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_bug594509.js
|
|
|
+@@ -1,9 +1,9 @@
|
|
|
+ add_task(async function() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:rights");
|
|
|
+
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, null, async function() {
|
|
|
+ Assert.ok(content.document.getElementById("your-rights"), "about:rights content loaded");
|
|
|
+ });
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_charsetMenu_swapBrowsers.js b/toolkit/content/tests/browser/browser_charsetMenu_swapBrowsers.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_charsetMenu_swapBrowsers.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_charsetMenu_swapBrowsers.js
|
|
|
+@@ -19,10 +19,10 @@ add_task(async function test() {
|
|
|
+ let swapped = BrowserTestUtils.waitForEvent(tab2.linkedBrowser, "SwapDocShells");
|
|
|
+
|
|
|
+ // NB: Closes tab1.
|
|
|
+ gBrowser.swapBrowsersAndCloseOther(tab2, tab1);
|
|
|
+ await swapped;
|
|
|
+
|
|
|
+ ok(charsetMenuEnabled(), "should have a charset after the swap");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab2);
|
|
|
++ BrowserTestUtils.removeTab(tab2);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_f7_caret_browsing.js b/toolkit/content/tests/browser/browser_f7_caret_browsing.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_f7_caret_browsing.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_f7_caret_browsing.js
|
|
|
+@@ -138,17 +138,17 @@ add_task(async function checkTogglingCar
|
|
|
+ await waitForFocusOnInput(tab.linkedBrowser);
|
|
|
+
|
|
|
+ ok(!Services.prefs.getBoolPref(kPrefCaretBrowsingOn), "Caret browsing should still be off after cancelling the dialog.");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref(kPrefShortcutEnabled, true);
|
|
|
+ Services.prefs.setBoolPref(kPrefWarnOnEnable, true);
|
|
|
+ Services.prefs.setBoolPref(kPrefCaretBrowsingOn, false);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function toggleCheckboxNoCaretBrowsing() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, kURL);
|
|
|
+ await focusInput(tab.linkedBrowser);
|
|
|
+
|
|
|
+ let promiseGotKey = promiseCaretPromptOpened();
|
|
|
+ hitF7();
|
|
|
+@@ -174,17 +174,17 @@ add_task(async function toggleCheckboxNo
|
|
|
+
|
|
|
+ syncToggleCaretNoDialog(false);
|
|
|
+ ok(!Services.prefs.getBoolPref(kPrefShortcutEnabled), "Shortcut should still be disabled.");
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref(kPrefShortcutEnabled, true);
|
|
|
+ Services.prefs.setBoolPref(kPrefWarnOnEnable, true);
|
|
|
+ Services.prefs.setBoolPref(kPrefCaretBrowsingOn, false);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
+ add_task(async function toggleCheckboxWantCaretBrowsing() {
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, kURL);
|
|
|
+ await focusInput(tab.linkedBrowser);
|
|
|
+
|
|
|
+ let promiseGotKey = promiseCaretPromptOpened();
|
|
|
+@@ -212,14 +212,14 @@ add_task(async function toggleCheckboxWa
|
|
|
+ syncToggleCaretNoDialog(false);
|
|
|
+ syncToggleCaretNoDialog(true);
|
|
|
+ syncToggleCaretNoDialog(false);
|
|
|
+
|
|
|
+ Services.prefs.setBoolPref(kPrefShortcutEnabled, true);
|
|
|
+ Services.prefs.setBoolPref(kPrefWarnOnEnable, true);
|
|
|
+ Services.prefs.setBoolPref(kPrefCaretBrowsingOn, false);
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_findbar.js b/toolkit/content/tests/browser/browser_findbar.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_findbar.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_findbar.js
|
|
|
+@@ -149,17 +149,17 @@ add_task(async function test_reinitializ
|
|
|
+ // Findbar should keep operating normally after remoteness change.
|
|
|
+ await promiseFindFinished("z", false);
|
|
|
+ is(findbar._findStatusDesc.textContent, findbar._notFoundStr,
|
|
|
+ "Findbar status text should be 'Phrase not found'");
|
|
|
+
|
|
|
+ await promiseFindFinished("s", false);
|
|
|
+ ok(!findbar._findStatusDesc.textContent, "Findbar status should be empty");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Ensure that the initial typed characters aren't lost immediately after
|
|
|
+ * opening the find bar.
|
|
|
+ */
|
|
|
+ add_task(async function() {
|
|
|
+ // This test only makes sence in e10s evironment.
|
|
|
+@@ -190,17 +190,17 @@ add_task(async function() {
|
|
|
+
|
|
|
+ is(findBar._findField.value, initialValue, "still has initial find query");
|
|
|
+
|
|
|
+ await Promise.all(promises);
|
|
|
+ is(document.activeElement, findBar._findField.inputField,
|
|
|
+ "findbar is now focused");
|
|
|
+ is(findBar._findField.value, "abc", "abc fully entered as find query");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ function promiseFindFinished(searchText, highlightOn) {
|
|
|
+ return new Promise(resolve => {
|
|
|
+
|
|
|
+ let findbar = gBrowser.getFindBar();
|
|
|
+ findbar.startFind(findbar.FIND_NORMAL);
|
|
|
+ let highlightElement = findbar.getElement("highlight");
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_label_textlink.js b/toolkit/content/tests/browser/browser_label_textlink.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_label_textlink.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_label_textlink.js
|
|
|
+@@ -11,28 +11,28 @@ add_task(async function() {
|
|
|
+ doc.documentElement.append(label);
|
|
|
+ });
|
|
|
+
|
|
|
+ // Test that click will open tab in foreground.
|
|
|
+ let awaitNewTab = BrowserTestUtils.waitForNewTab(gBrowser, newTabURL);
|
|
|
+ await BrowserTestUtils.synthesizeMouseAtCenter("#textlink-test", {}, browser);
|
|
|
+ let newTab = await awaitNewTab;
|
|
|
+ is(newTab.linkedBrowser, gBrowser.selectedBrowser, "selected tab should be example page");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+
|
|
|
+ // Test that ctrl+shift+click/meta+shift+click will open tab in background.
|
|
|
+ awaitNewTab = BrowserTestUtils.waitForNewTab(gBrowser, newTabURL);
|
|
|
+ await BrowserTestUtils.synthesizeMouseAtCenter("#textlink-test",
|
|
|
+ {ctrlKey: true, metaKey: true, shiftKey: true},
|
|
|
+ browser);
|
|
|
+ await awaitNewTab;
|
|
|
+ is(gBrowser.selectedBrowser, browser, "selected tab should be original tab");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
|
|
|
+
|
|
|
+ // Middle-clicking should open tab in foreground.
|
|
|
+ awaitNewTab = BrowserTestUtils.waitForNewTab(gBrowser, newTabURL);
|
|
|
+ await BrowserTestUtils.synthesizeMouseAtCenter("#textlink-test",
|
|
|
+ {button: 1}, browser);
|
|
|
+ newTab = await awaitNewTab;
|
|
|
+ is(newTab.linkedBrowser, gBrowser.selectedBrowser, "selected tab should be example page");
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
|
|
|
+ });
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_mute_webAudio.js b/toolkit/content/tests/browser/browser_mute_webAudio.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_mute_webAudio.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_mute_webAudio.js
|
|
|
+@@ -66,10 +66,10 @@ add_task(async function mute_web_audio()
|
|
|
+ ok(tab.linkedBrowser.audioMuted, "Audio should be muted now");
|
|
|
+ await click_icon(tab);
|
|
|
+ ok(!tab.linkedBrowser.audioMuted, "Audio should be unmuted now");
|
|
|
+
|
|
|
+ info("- tab should be audible -");
|
|
|
+ await waitForTabPlayingEvent(tab, true);
|
|
|
+
|
|
|
+ info("- remove tab -");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_resume_bkg_video_on_tab_hover.js b/toolkit/content/tests/browser/browser_resume_bkg_video_on_tab_hover.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_resume_bkg_video_on_tab_hover.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_resume_bkg_video_on_tab_hover.js
|
|
|
+@@ -135,11 +135,11 @@ add_task(async function resume_and_suspe
|
|
|
+ info("- video's owner tab goes to background again, should suspend video -");
|
|
|
+ promise = get_video_decoding_suspend_promise(browser);
|
|
|
+ let blankTab = await BrowserTestUtils.openNewForegroundTab(window.gBrowser,
|
|
|
+ "about:blank");
|
|
|
+ await promise;
|
|
|
+ await check_should_send_unselected_tab_hover_msg(browser);
|
|
|
+
|
|
|
+ info("- remove tabs -");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
+- await BrowserTestUtils.removeTab(blankTab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(blankTab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/browser_sound_indicator_silent_video.js b/toolkit/content/tests/browser/browser_sound_indicator_silent_video.js
|
|
|
+--- a/toolkit/content/tests/browser/browser_sound_indicator_silent_video.js
|
|
|
++++ b/toolkit/content/tests/browser/browser_sound_indicator_silent_video.js
|
|
|
+@@ -37,17 +37,17 @@ add_task(async function should_not_show_
|
|
|
+ await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, true /* playing */,
|
|
|
+ check_audio_playing_state);
|
|
|
+
|
|
|
+ info("- tab should not have sound indicator after playing silent video -");
|
|
|
+ await waitForTabPlayingEvent(tab, false);
|
|
|
+
|
|
|
+ info("- remove tab -");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function should_not_show_sound_indicator_for_almost_silent_video() {
|
|
|
+ info("- open new foreground tab -");
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(window.gBrowser,
|
|
|
+ "about:blank");
|
|
|
+
|
|
|
+ info("- tab should not have sound indicator before playing almost silent video -");
|
|
|
+@@ -58,10 +58,10 @@ add_task(async function should_not_show_
|
|
|
+ await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
|
|
|
+ await ContentTask.spawn(tab.linkedBrowser, true /* playing */,
|
|
|
+ check_audio_playing_state);
|
|
|
+
|
|
|
+ info("- tab should not have sound indicator after playing almost silent video -");
|
|
|
+ await waitForTabPlayingEvent(tab, false);
|
|
|
+
|
|
|
+ info("- remove tab -");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+diff --git a/toolkit/content/tests/browser/head.js b/toolkit/content/tests/browser/head.js
|
|
|
+--- a/toolkit/content/tests/browser/head.js
|
|
|
++++ b/toolkit/content/tests/browser/head.js
|
|
|
+@@ -162,17 +162,17 @@ class DateTimeTestHelper {
|
|
|
+ if (!this.panel.hidden) {
|
|
|
+ let pickerClosePromise = new Promise(resolve => {
|
|
|
+ this.panel.addEventListener("popuphidden", resolve, {once: true});
|
|
|
+ });
|
|
|
+ this.panel.hidePopup();
|
|
|
+ this.panel.closePicker();
|
|
|
+ await pickerClosePromise;
|
|
|
+ }
|
|
|
+- await BrowserTestUtils.removeTab(this.tab);
|
|
|
++ BrowserTestUtils.removeTab(this.tab);
|
|
|
+ this.tab = null;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Clean up after tests. Remove the frame to prevent leak.
|
|
|
+ */
|
|
|
+ cleanup() {
|
|
|
+ this.frame.remove();
|
|
|
+diff --git a/toolkit/modules/tests/browser/browser_FinderHighlighter.js b/toolkit/modules/tests/browser/browser_FinderHighlighter.js
|
|
|
+--- a/toolkit/modules/tests/browser/browser_FinderHighlighter.js
|
|
|
++++ b/toolkit/modules/tests/browser/browser_FinderHighlighter.js
|
|
|
+@@ -435,17 +435,17 @@ add_task(async function testHideOnLocati
|
|
|
+ promise = promiseTestHighlighterOutput(browser, word, {
|
|
|
+ rectCount: 0,
|
|
|
+ insertCalls: [0, 0],
|
|
|
+ removeCalls: [1, 2]
|
|
|
+ });
|
|
|
+ await BrowserTestUtils.loadURI(browser, url);
|
|
|
+ await promise;
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function testHideOnClear() {
|
|
|
+ let url = kFixtureBaseURL + "file_FinderSample.html";
|
|
|
+ await BrowserTestUtils.withNewTab(url, async function(browser) {
|
|
|
+ let findbar = gBrowser.getFindBar();
|
|
|
+ await promiseOpenFindbar(findbar);
|
|
|
+
|
|
|
+diff --git a/toolkit/modules/tests/browser/browser_WebRequest_ancestors.js b/toolkit/modules/tests/browser/browser_WebRequest_ancestors.js
|
|
|
+--- a/toolkit/modules/tests/browser/browser_WebRequest_ancestors.js
|
|
|
++++ b/toolkit/modules/tests/browser/browser_WebRequest_ancestors.js
|
|
|
+@@ -13,17 +13,17 @@ add_task(async function test_ancestors_e
|
|
|
+ deferred.resolve();
|
|
|
+ }
|
|
|
+
|
|
|
+ // Filter on a path to ensure the root favicon request doesn't confuse the test.
|
|
|
+ WebRequest.onBeforeRequest.addListener(onBeforeRequest, {urls: new MatchPatternSet(["http://mochi.test/test/*"])}, ["blocking"]);
|
|
|
+
|
|
|
+ let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://mochi.test:8888/test/");
|
|
|
+ await deferred.promise;
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ WebRequest.onBeforeRequest.removeListener(onBeforeRequest);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function test_ancestors_null() {
|
|
|
+ let deferred = PromiseUtils.defer();
|
|
|
+ function onBeforeRequest(details) {
|
|
|
+ info(`onBeforeRequest ${details.url}`);
|
|
|
+diff --git a/toolkit/mozapps/extensions/test/browser/browser_file_xpi_no_process_switch.js b/toolkit/mozapps/extensions/test/browser/browser_file_xpi_no_process_switch.js
|
|
|
+--- a/toolkit/mozapps/extensions/test/browser/browser_file_xpi_no_process_switch.js
|
|
|
++++ b/toolkit/mozapps/extensions/test/browser/browser_file_xpi_no_process_switch.js
|
|
|
+@@ -80,17 +80,17 @@ async function testOpenedAndDraggedXPI(a
|
|
|
+ "move");
|
|
|
+ is(effect, "move", "Drag should be accepted");
|
|
|
+ let [newTab, newTabInstallNotification] = await promiseTabAndNotification;
|
|
|
+ await promiseNotification;
|
|
|
+ if (gBrowser.selectedTab != newTab) {
|
|
|
+ await BrowserTestUtils.switchTab(gBrowser, newTab);
|
|
|
+ }
|
|
|
+ await newTabInstallNotification;
|
|
|
+- await BrowserTestUtils.removeTab(newTab);
|
|
|
++ BrowserTestUtils.removeTab(newTab);
|
|
|
+ await CheckBrowserInPid(aBrowser, browserPid,
|
|
|
+ "Check that browser has not switched process.");
|
|
|
+ }
|
|
|
+
|
|
|
+ // Test for bug 1175267.
|
|
|
+ add_task(async function() {
|
|
|
+ await SpecialPowers.pushPrefEnv({
|
|
|
+ set: [["xpinstall.customConfirmationUI", true]]
|
|
|
+diff --git a/toolkit/mozapps/extensions/test/browser/browser_getmorethemes.js b/toolkit/mozapps/extensions/test/browser/browser_getmorethemes.js
|
|
|
+--- a/toolkit/mozapps/extensions/test/browser/browser_getmorethemes.js
|
|
|
++++ b/toolkit/mozapps/extensions/test/browser/browser_getmorethemes.js
|
|
|
+@@ -18,17 +18,17 @@ add_task(async function getthemes_link_v
|
|
|
+
|
|
|
+ info("Clicking button to get more themes");
|
|
|
+ let awaitNewTab = BrowserTestUtils.waitForNewTab(gBrowser, MAIN_URL);
|
|
|
+ EventUtils.synthesizeMouseAtCenter(button, { }, aManager);
|
|
|
+ await awaitNewTab;
|
|
|
+
|
|
|
+ is(gBrowser.currentURI.spec, Services.urlFormatter.formatURLPref(PREF_GETTHEMESURL), "Theme discovery URL should match");
|
|
|
+
|
|
|
+- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+ await close_manager(aManager);
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function getthemes_link_hidden_on_appearance_when_pref_cleared() {
|
|
|
+ await SpecialPowers.pushPrefEnv({set: [[PREF_GETTHEMESURL, ""]]});
|
|
|
+
|
|
|
+ let aManager = await open_manager("addons://list/extension");
|
|
|
+ info("Testing theme discovery information");
|
|
|
+diff --git a/toolkit/mozapps/extensions/test/browser/browser_legacy_themes.js.1442465-4_2.later b/toolkit/mozapps/extensions/test/browser/browser_legacy_themes.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/toolkit/mozapps/extensions/test/browser/browser_legacy_themes.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,16 @@
|
|
|
++--- browser_legacy_themes.js
|
|
|
+++++ browser_legacy_themes.js
|
|
|
++@@ -68,12 +68,12 @@ add_task(async function() {
|
|
|
++ // In automation, app.support.baseURL points to a page on localhost.
|
|
|
++ // The actual page is 404 in the test but that doesn't matter here,
|
|
|
++ // just the fact that we load the right URL.
|
|
|
++ let url = Services.prefs.getStringPref("app.support.baseURL") + "complete-themes";
|
|
|
++ let tabPromise = BrowserTestUtils.waitForNewTab(gBrowser, url);
|
|
|
++ button.click();
|
|
|
++ let tab = await tabPromise;
|
|
|
++ ok(true, "Find a replacement button opened SUMO page");
|
|
|
++- await BrowserTestUtils.removeTab(tab);
|
|
|
+++ BrowserTestUtils.removeTab(tab);
|
|
|
++
|
|
|
++ await close_manager(mgrWin);
|
|
|
++ });
|
|
|
+diff --git a/toolkit/mozapps/extensions/test/browser/browser_webext_options_addon_reload.js.1442465-4_2.later b/toolkit/mozapps/extensions/test/browser/browser_webext_options_addon_reload.js.1442465-4_2.later
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/toolkit/mozapps/extensions/test/browser/browser_webext_options_addon_reload.js.1442465-4_2.later
|
|
|
+@@ -0,0 +1,16 @@
|
|
|
++--- browser_webext_options_addon_reload.js
|
|
|
+++++ browser_webext_options_addon_reload.js
|
|
|
++@@ -94,12 +94,12 @@ add_task(async function test_options_on_
|
|
|
++ info("Wait the new options_ui page XUL browser to be created");
|
|
|
++ await onceOptionsReloaded;
|
|
|
++
|
|
|
++ let optionsBrowsers = aboutAddonsDocument.querySelectorAll("#addon-options");
|
|
|
++
|
|
|
++ Assert.equal(optionsBrowsers.length, 1, "Got a single XUL browser for the addon options_ui page");
|
|
|
++ }
|
|
|
++
|
|
|
++- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
+++ BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
|
|
++
|
|
|
++ await extension.unload();
|
|
|
++ });
|
|
|
+diff --git a/uriloader/exthandler/tests/mochitest/browser_auto_close_window.js b/uriloader/exthandler/tests/mochitest/browser_auto_close_window.js
|
|
|
+--- a/uriloader/exthandler/tests/mochitest/browser_auto_close_window.js
|
|
|
++++ b/uriloader/exthandler/tests/mochitest/browser_auto_close_window.js
|
|
|
+@@ -117,17 +117,17 @@ add_task(async function nested_window_op
|
|
|
+
|
|
|
+ await ContentTask.spawn(nestedBrowser, null, function() {
|
|
|
+ ok(content.opener, "this window has an opener");
|
|
|
+ });
|
|
|
+
|
|
|
+ await testNewTab(nestedBrowser);
|
|
|
+
|
|
|
+ isnot(secondTab.linkedBrowser, null, "the page that triggered the download is still open");
|
|
|
+- await BrowserTestUtils.removeTab(secondTab);
|
|
|
++ BrowserTestUtils.removeTab(secondTab);
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ add_task(async function cleanup() {
|
|
|
+ // Unregister our factory from XPCOM and restore the original CID.
|
|
|
+ registrar.unregisterFactory(MOCK_HELPERAPP_DIALOG_CID, mockHelperAppService);
|
|
|
+ registrar.registerFactory(HELPERAPP_DIALOG_CID, "",
|
|
|
+ HELPERAPP_DIALOG_CONTRACT_ID, null);
|
|
|
+diff --git a/uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js b/uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js
|
|
|
+--- a/uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js
|
|
|
++++ b/uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js
|
|
|
+@@ -43,17 +43,17 @@ add_task(async function() {
|
|
|
+
|
|
|
+ let promiseTabOpened =
|
|
|
+ BrowserTestUtils.waitForNewTab(gBrowser, expectedURL);
|
|
|
+ await BrowserTestUtils.synthesizeMouseAtCenter(link, {button: 1}, browser);
|
|
|
+ let tab = await promiseTabOpened;
|
|
|
+ gBrowser.selectedTab = tab;
|
|
|
+ is(gURLBar.value, expectedURL,
|
|
|
+ "the expected URL is displayed in the location bar");
|
|
|
+- await BrowserTestUtils.removeTab(tab);
|
|
|
++ BrowserTestUtils.removeTab(tab);
|
|
|
+
|
|
|
+ // Shift-click the testprotocol link and check the new window.
|
|
|
+ let newWindowPromise = BrowserTestUtils.waitForNewWindow();
|
|
|
+ await BrowserTestUtils.synthesizeMouseAtCenter(link, {shiftKey: true},
|
|
|
+ browser);
|
|
|
+ let win = await newWindowPromise;
|
|
|
+ await BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
|
|
|
+ await BrowserTestUtils.waitForCondition(() => win.gBrowser.currentURI.spec == expectedURL);
|
Frank-Rainer Grahl