diff -r 000000000000 -r 6474c204b198 browser/components/customizableui/test/browser_940307_panel_click_closure_handling.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/components/customizableui/test/browser_940307_panel_click_closure_handling.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,108 @@
+/* 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/. */
+
+"use strict";
+
+let button, menuButton;
+/* Clicking a button should close the panel */
+add_task(function() {
+  button = document.createElement("toolbarbutton");
+  button.id = "browser_940307_button";
+  button.setAttribute("label", "Button");
+  PanelUI.contents.appendChild(button);
+  yield PanelUI.show();
+  let hiddenAgain = promisePanelHidden(window);
+  EventUtils.synthesizeMouseAtCenter(button, {});
+  yield hiddenAgain;
+  button.remove();
+});
+
+/* Clicking a menu button should close the panel, opening the popup shouldn't.  */
+add_task(function() {
+  menuButton = document.createElement("toolbarbutton");
+  menuButton.setAttribute("type", "menu-button");
+  menuButton.id = "browser_940307_menubutton";
+  menuButton.setAttribute("label", "Menu button");
+
+  let menuPopup = document.createElement("menupopup");
+  menuPopup.id = "browser_940307_menupopup";
+
+  let menuItem = document.createElement("menuitem");
+  menuItem.setAttribute("label", "Menu item");
+  menuItem.id = "browser_940307_menuitem";
+
+  menuPopup.appendChild(menuItem);
+  menuButton.appendChild(menuPopup);
+  PanelUI.contents.appendChild(menuButton);
+
+  yield PanelUI.show();
+  let hiddenAgain = promisePanelHidden(window);
+  let innerButton = document.getAnonymousElementByAttribute(menuButton, "anonid", "button");
+  EventUtils.synthesizeMouseAtCenter(innerButton, {});
+  yield hiddenAgain;
+
+  // Now click the dropmarker to show the menu
+  yield PanelUI.show();
+  hiddenAgain = promisePanelHidden(window);
+  let menuShown = promisePanelElementShown(window, menuPopup);
+  let dropmarker = document.getAnonymousElementByAttribute(menuButton, "type", "menu-button");
+  EventUtils.synthesizeMouseAtCenter(dropmarker, {});
+  yield menuShown;
+  // Panel should stay open:
+  ok(isPanelUIOpen(), "Panel should still be open");
+  let menuHidden = promisePanelElementHidden(window, menuPopup);
+  // Then click the menu item to close all the things
+  EventUtils.synthesizeMouseAtCenter(menuItem, {});
+  yield menuHidden;
+  yield hiddenAgain;
+  menuButton.remove();
+});
+
+add_task(function() {
+  let searchbar = document.getElementById("searchbar");
+  gCustomizeMode.addToPanel(searchbar);
+  let placement = CustomizableUI.getPlacementOfWidget("search-container");
+  is(placement.area, CustomizableUI.AREA_PANEL, "Should be in panel");
+  yield PanelUI.show();
+  yield waitForCondition(() => "value" in searchbar && searchbar.value === "");
+
+  searchbar.value = "foo";
+  searchbar.focus();
+  // Reaching into this context menu is pretty evil, but hey... it's a test.
+  let textbox = document.getAnonymousElementByAttribute(searchbar.textbox, "anonid", "textbox-input-box");
+  let contextmenu = document.getAnonymousElementByAttribute(textbox, "anonid", "input-box-contextmenu");
+  let contextMenuShown = promisePanelElementShown(window, contextmenu);
+  EventUtils.synthesizeMouseAtCenter(searchbar, {type: "contextmenu", button: 2});
+  yield contextMenuShown;
+
+  ok(isPanelUIOpen(), "Panel should still be open");
+
+  let selectAll = contextmenu.querySelector("[cmd='cmd_selectAll']");
+  let contextMenuHidden = promisePanelElementHidden(window, contextmenu);
+  EventUtils.synthesizeMouseAtCenter(selectAll, {});
+  yield contextMenuHidden;
+
+  ok(isPanelUIOpen(), "Panel should still be open");
+
+  let hiddenPanelPromise = promisePanelHidden(window);
+  EventUtils.synthesizeKey("VK_ESCAPE", {});
+  yield hiddenPanelPromise;
+  ok(!isPanelUIOpen(), "Panel should no longer be open");
+});
+
+registerCleanupFunction(function() {
+  if (button && button.parentNode) {
+    button.remove();
+  }
+  if (menuButton && menuButton.parentNode) {
+    menuButton.remove();
+  }
+  // Sadly this isn't task.jsm-enabled, so we can't wait for this to happen. But we should
+  // definitely close it here and hope it won't interfere with other tests.
+  // Of course, all the tests are meant to do this themselves, but if they fail...
+  if (isPanelUIOpen()) {
+    PanelUI.hide();
+  }
+});
+