Bug 1522521 - Move and correct indentation in browser_bug555767.js. r=adw
authorMark Banner <standard8@mozilla.com>
Wed, 27 Feb 2019 08:05:38 +0000
changeset 519294 af366b1dc82e5eab80a35459fff6f8d94b003999
parent 519293 0a3675e5f4abd788bb1a10be592d9006479a01e7
child 519295 374fbf5e2569f94d681e30ef97c9fa1cd5979c2c
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersadw
bugs1522521, 555767
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1522521 - Move and correct indentation in browser_bug555767.js. r=adw Differential Revision: https://phabricator.services.mozilla.com/D21243
browser/base/content/test/general/browser.ini
browser/base/content/test/general/browser_bug555767.js
browser/components/urlbar/tests/browser/browser.ini
browser/components/urlbar/tests/browser/browser_switchToTab_closes_newtab.js
browser/components/urlbar/tests/legacy/browser.ini
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -149,18 +149,16 @@ skip-if = true # Bug 1478159
 subsuite = clipboard
 skip-if = true # bug 1393813
 # skip-if = e10s # Bug 1134458 - Find bar doesn't work correctly in a detached tab
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug537474.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug555224.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
-[browser_bug555767.js]
-# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug559991.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug563588.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug565575.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug567306.js]
 subsuite = clipboard
--- a/browser/components/urlbar/tests/browser/browser.ini
+++ b/browser/components/urlbar/tests/browser/browser.ini
@@ -39,16 +39,17 @@ subsuite = clipboard
 [browser_populateAfterPushState.js]
 [browser_redirect_error.js]
 support-files = redirect_error.sjs
 [browser_remotetab.js]
 [browser_removeUnsafeProtocolsFromURLBarPaste.js]
 subsuite = clipboard
 [browser_search_favicon.js]
 skip-if = true # Bug 1526222 - Doesn't currently work with QuantumBar
+[browser_switchToTab_closes_newtab.js]
 [browser_switchToTabHavingURI_aOpenParams.js]
 [browser_tabMatchesInAwesomebar_perwindowpb.js]
 skip-if = os == 'linux' # Bug 1104755 (Intermittent failure)
 [browser_tabMatchesInAwesomebar.js]
 support-files =
   moz.png
 [browser_urlbar_blanking.js]
 support-files =
rename from browser/base/content/test/general/browser_bug555767.js
rename to browser/components/urlbar/tests/browser/browser_switchToTab_closes_newtab.js
--- a/browser/base/content/test/general/browser_bug555767.js
+++ b/browser/components/urlbar/tests/browser/browser_switchToTab_closes_newtab.js
@@ -1,53 +1,53 @@
-    /* This Source Code Form is subject to the terms of the Mozilla Public
-     * License, v. 2.0. If a copy of the MPL was not distributed with this
-     * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-    add_task(async function listener() {
-      let testURL = "http://example.org/browser/browser/base/content/test/general/dummy_page.html";
-      let tabSelected = false;
+add_task(async function listener() {
+  let testURL = "http://example.org/browser/browser/base/content/test/general/dummy_page.html";
+  let tabSelected = false;
 
-      // Open the base tab
-      let baseTab = BrowserTestUtils.addTab(gBrowser, testURL);
+  // Open the base tab
+  let baseTab = BrowserTestUtils.addTab(gBrowser, testURL);
 
-      // Wait for the tab to be fully loaded so matching happens correctly
-      await promiseTabLoaded(baseTab);
-      if (baseTab.linkedBrowser.currentURI.spec == "about:blank")
-        return;
-      baseTab.linkedBrowser.removeEventListener("load", listener, true);
+  // Wait for the tab to be fully loaded so matching happens correctly
+  await promiseTabLoaded(baseTab);
+  if (baseTab.linkedBrowser.currentURI.spec == "about:blank")
+    return;
+  baseTab.linkedBrowser.removeEventListener("load", listener, true);
 
-      let testTab = BrowserTestUtils.addTab(gBrowser);
+  let testTab = BrowserTestUtils.addTab(gBrowser);
 
-      // Select the testTab
-      gBrowser.selectedTab = testTab;
+  // Select the testTab
+  gBrowser.selectedTab = testTab;
 
-      // Set the urlbar to include the moz-action
-      gURLBar.value = "moz-action:switchtab," + JSON.stringify({url: testURL});
-      // Focus the urlbar so we can press enter
-      gURLBar.focus();
+  // Set the urlbar to include the moz-action
+  gURLBar.value = "moz-action:switchtab," + JSON.stringify({url: testURL});
+  // Focus the urlbar so we can press enter
+  gURLBar.focus();
 
-      // Functions for TabClose and TabSelect
-      function onTabClose(aEvent) {
-        gBrowser.tabContainer.removeEventListener("TabClose", onTabClose);
-        // Make sure we get the TabClose event for testTab
-        is(aEvent.originalTarget, testTab, "Got the TabClose event for the right tab");
-        // Confirm that we did select the tab
-        ok(tabSelected, "Confirming that the tab was selected");
-        gBrowser.removeTab(baseTab);
-        finish();
-      }
-      function onTabSelect(aEvent) {
-        gBrowser.tabContainer.removeEventListener("TabSelect", onTabSelect);
-        // Make sure we got the TabSelect event for baseTab
-        is(aEvent.originalTarget, baseTab, "Got the TabSelect event for the right tab");
-        // Confirm that the selected tab is in fact base tab
-        is(gBrowser.selectedTab, baseTab, "We've switched to the correct tab");
-        tabSelected = true;
-      }
+  // Functions for TabClose and TabSelect
+  function onTabClose(aEvent) {
+    gBrowser.tabContainer.removeEventListener("TabClose", onTabClose);
+    // Make sure we get the TabClose event for testTab
+    is(aEvent.originalTarget, testTab, "Got the TabClose event for the right tab");
+    // Confirm that we did select the tab
+    ok(tabSelected, "Confirming that the tab was selected");
+    gBrowser.removeTab(baseTab);
+    finish();
+  }
+  function onTabSelect(aEvent) {
+    gBrowser.tabContainer.removeEventListener("TabSelect", onTabSelect);
+    // Make sure we got the TabSelect event for baseTab
+    is(aEvent.originalTarget, baseTab, "Got the TabSelect event for the right tab");
+    // Confirm that the selected tab is in fact base tab
+    is(gBrowser.selectedTab, baseTab, "We've switched to the correct tab");
+    tabSelected = true;
+  }
 
-      // Add the TabClose, TabSelect event listeners before we press enter
-      gBrowser.tabContainer.addEventListener("TabClose", onTabClose);
-      gBrowser.tabContainer.addEventListener("TabSelect", onTabSelect);
+  // Add the TabClose, TabSelect event listeners before we press enter
+  gBrowser.tabContainer.addEventListener("TabClose", onTabClose);
+  gBrowser.tabContainer.addEventListener("TabSelect", onTabSelect);
 
-      // Press enter!
-      EventUtils.synthesizeKey("KEY_Enter");
-    });
+  // Press enter!
+  EventUtils.synthesizeKey("KEY_Enter");
+});
--- a/browser/components/urlbar/tests/legacy/browser.ini
+++ b/browser/components/urlbar/tests/legacy/browser.ini
@@ -78,16 +78,17 @@ skip-if = (os == "linux" || os == "mac")
 subsuite = clipboard
 [../browser/browser_populateAfterPushState.js]
 [../browser/browser_redirect_error.js]
 support-files = ../browser/redirect_error.sjs
 [../browser/browser_remotetab.js]
 [../browser/browser_removeUnsafeProtocolsFromURLBarPaste.js]
 subsuite = clipboard
 [../browser/browser_search_favicon.js]
+[../browser/browser_switchToTab_closes_newtab.js]
 [../browser/browser_switchToTabHavingURI_aOpenParams.js]
 [../browser/browser_tabMatchesInAwesomebar_perwindowpb.js]
 skip-if = os == 'linux' # Bug 1104755
 [../browser/browser_tabMatchesInAwesomebar.js]
 support-files =
   ../browser/moz.png
 [../browser/browser_urlbarAboutHomeLoading.js]
 [../browser/browser_urlbarCopying.js]