Bug 607566 - Test for bug 595930 takes too long to run [r=ian, a=beltzner]

browser/base/content/tabview/groupitems.js

@@ -557,8 +557,6 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
   close: function GroupItem_close() {
     this.removeAll();
     GroupItems.unregister(this);
-    this._sendToSubscribers("close");
-    this.removeTrenches();
 
     if (this.hidden) {
       iQ(this.container).remove();
@@ -566,8 +564,11 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
         this.$undoContainer.remove();
         this.$undoContainer = null;
        }
+      this.removeTrenches();
       Items.unsquish();
+      this._sendToSubscribers("close");
     } else {
+      let self = this;
       iQ(this.container).animate({
         opacity: 0,
         "-moz-transform": "scale(.3)",
@@ -575,7 +576,9 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
         duration: 170,
         complete: function() {
           iQ(this).remove();
+          self.removeTrenches();
           Items.unsquish();
+          self._sendToSubscribers("close");
         }
       });
     }

browser/base/content/test/tabview/browser_tabview_bug595930.js

@@ -11,7 +11,7 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
- * The Original Code is tabview test for bug 587040.
+ * The Original Code is tabview test for bug 595930.
  *
  * The Initial Developer of the Original Code is
  * Mozilla Foundation.
@@ -71,15 +71,24 @@ function onTabViewWindowLoaded() {
     };
     window.addEventListener("tabviewhidden", onTabViewHidden, false);
 
-    EventUtils.synthesizeKey("e", {accelKey : true}, contentWindow);
+    // delay to give time for hidden group DOM element to be removed so
+    // the appropriate group would get selected when the key
+    // combination is pressed
+    executeSoon(function() { 
+      EventUtils.synthesizeKey("e", {accelKey : true}, contentWindow);
+    });
+  });
+
+  group1.addSubscriber(group1, "groupHidden", function() {
+    group1.removeSubscriber(group1, "groupHidden");
+
+    // close undo group
+    let closeButton = group1.$undoContainer.find(".close");
+    EventUtils.sendMouseEvent(
+      { type: "click" }, closeButton[0], contentWindow);
   });
 
   // Get rid of the group and its children
   group1.closeAll();
-  
-  // close undo group
-  let closeButton = group1.$undoContainer.find(".close");
-  EventUtils.sendMouseEvent(
-    { type: "click" }, closeButton[0], contentWindow);
 }