Bug 999618 - fix browser-chrome tests in browser/base/content/test/ge…

…neral to not remove the original tab; r=ehsan
dothq · Apr 22, 2014 · 314c359 · 314c359
1 parent 15d1bae
commit 314c359
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 18 deletions.
diff --git a/browser/base/content/test/general/browser_bug406216.js b/browser/base/content/test/general/browser_bug406216.js
@@ -21,8 +21,6 @@ function test() {
 
 function addTab(aURI, aIndex) {
   var tab = gBrowser.addTab(aURI);
-  if (aIndex == 0)
-    gBrowser.removeTab(gBrowser.tabs[0]);
 
   tab.linkedBrowser.addEventListener("load", function (event) {
     event.currentTarget.removeEventListener("load", arguments.callee, true);
@@ -32,23 +30,22 @@ function addTab(aURI, aIndex) {
 }
 
 function doTabsTest() {
-  is(gBrowser.tabs.length, URIS.length, "Correctly opened all expected tabs");
+  is(gBrowser.tabs.length - 1, URIS.length, "Correctly opened all expected tabs");
 
   // sample of "close related tabs" feature
   gBrowser.tabContainer.addEventListener("TabClose", function (event) {
     event.currentTarget.removeEventListener("TabClose", arguments.callee, true);
     var closedTab = event.originalTarget;
     var scheme = closedTab.linkedBrowser.currentURI.scheme;
-    Array.slice(gBrowser.tabs).forEach(function (aTab) {
-      if (aTab != closedTab && aTab.linkedBrowser.currentURI.scheme == scheme)
+    Array.slice(gBrowser.tabs).forEach(function (aTab, aIndex) {
+      if (aIndex != 0 && aTab != closedTab && aTab.linkedBrowser.currentURI.scheme == scheme)
         gBrowser.removeTab(aTab);
     });
   }, true);
 
-  gBrowser.removeTab(gBrowser.tabs[0]);
-  is(gBrowser.tabs.length, 1, "Related tabs are not closed unexpectedly");
+  gBrowser.removeTab(gBrowser.tabs[1]);
+  is(gBrowser.tabs.length - 1, 1, "Related tabs are not closed unexpectedly");
 
-  gBrowser.addTab("about:blank");
-  gBrowser.removeTab(gBrowser.tabs[0]);
+  gBrowser.removeTab(gBrowser.tabs[1]);
   finish();
 }
diff --git a/browser/base/content/test/general/browser_bug563588.js b/browser/base/content/test/general/browser_bug563588.js
@@ -10,8 +10,8 @@ function press(key, expectedPos) {
 }
 
 function test() {
-  gBrowser.addTab();
-  gBrowser.addTab();
+  var t1 = gBrowser.addTab();
+  var t2 = gBrowser.addTab();
   is(gBrowser.tabs.length, 3, "got three tabs");
   is(gBrowser.tabs[0], gBrowser.selectedTab, "first tab is selected");
 
@@ -25,6 +25,6 @@ function test() {
   press("end", 2);
   press("home", 0);
 
-  gBrowser.removeCurrentTab();
-  gBrowser.removeCurrentTab();
+  gBrowser.removeTab(t1);
+  gBrowser.removeTab(t2);
 }
diff --git a/browser/base/content/test/general/browser_popupUI.js b/browser/base/content/test/general/browser_popupUI.js
@@ -2,6 +2,8 @@ function test() {
   waitForExplicitFinish();
   gPrefService.setBoolPref("dom.disable_open_during_load", false);
 
+  gBrowser.selectedTab = gBrowser.addTab();
+
   var browser = gBrowser.selectedBrowser;
   browser.addEventListener("load", function () {
     browser.removeEventListener("load", arguments.callee, true);
@@ -51,7 +53,6 @@ function testPopupUI(win) {
 
   if (!win.closed)
     win.close();
-  gBrowser.addTab();
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/base/content/test/general/browser_save_video.js b/browser/base/content/test/general/browser_save_video.js
@@ -12,10 +12,9 @@ function test() {
   waitForExplicitFinish();
   var fileName;
 
-  gBrowser.loadURI("http://mochi.test:8888/browser/browser/base/content/test/general/bug564387.html");
+  gBrowser.selectedTab = gBrowser.addTab("http://mochi.test:8888/browser/browser/base/content/test/general/bug564387.html");
 
   registerCleanupFunction(function () {
-    gBrowser.addTab();
     gBrowser.removeCurrentTab();
   });
 

diff --git a/browser/base/content/test/general/browser_tabMatchesInAwesomebar_perwindowpb.js b/browser/base/content/test/general/browser_tabMatchesInAwesomebar_perwindowpb.js
@@ -80,8 +80,8 @@ var gTestSteps = [
 
     gBrowser.addTab("about:blank", {skipAnimation: true});
     while (gBrowser.tabs.length > 1) {
-      info("Removing tab: " + gBrowser.tabs[0].linkedBrowser.currentURI.spec);
-      gBrowser.selectTabAtIndex(0);
+      info("Removing tab: " + gBrowser.tabs[1].linkedBrowser.currentURI.spec);
+      gBrowser.selectTabAtIndex(1);
       gBrowser.removeCurrentTab();
     }
     ensure_opentabs_match_db(nextStep);