Bug 1522521 - Move and correct indentation in browser_bug555767.js. r=adw

Differential Revision: https://phabricator.services.mozilla.com/D21243

--HG--
rename : browser/base/content/test/general/browser_bug555767.js => browser/components/urlbar/tests/browser/browser_switchToTab_closes_newtab.js
extra : moz-landing-system : lando

browser/base/content/test/general/browser.ini

@@ -154,8 +154,6 @@ skip-if = true # bug 1393813
 # 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]

browser/base/content/test/general/browser_bug555767.js

@@ -1,53 +0,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;
-
-      // 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);
-
-      let testTab = BrowserTestUtils.addTab(gBrowser);
-
-      // 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();
-
-      // 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);
-
-      // Press enter!
-      EventUtils.synthesizeKey("KEY_Enter");
-    });

browser/components/urlbar/tests/browser/browser.ini

@@ -44,6 +44,7 @@ support-files = redirect_error.sjs
 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/components/urlbar/tests/browser/browser_switchToTab_closes_newtab.js

@@ -0,0 +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/. */
+
+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);
+
+  // 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);
+
+  // 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();
+
+  // 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);
+
+  // Press enter!
+  EventUtils.synthesizeKey("KEY_Enter");
+});

browser/components/urlbar/tests/legacy/browser.ini

@@ -83,6 +83,7 @@ support-files = ../browser/redirect_error.sjs
 [../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