1 files changed, 70 insertions, 0 deletions
diff --git a/browser/components/customizableui/test/browser_940013_registerToolbarNode_calls_registerArea.js b/browser/components/customizableui/test/browser_940013_registerToolbarNode_calls_registerArea.js
new file mode 100644
index 000000000..c554bffab
--- /dev/null
+++ b/browser/components/customizableui/test/browser_940013_registerToolbarNode_calls_registerArea.js
@@ -0,0 +1,70 @@
+/* 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";
+
+const kToolbarId = "test-registerToolbarNode-toolbar";
+const kButtonId = "test-registerToolbarNode-button";
+registerCleanupFunction(cleanup);
+
+// Registering a toolbar with defaultset attribute should work
+add_task(function*() {
+  ok(CustomizableUI.inDefaultState, "Everything should be in its default state.");
+  let btn = createDummyXULButton(kButtonId);
+  let toolbar = document.createElement("toolbar");
+  toolbar.id = kToolbarId;
+  toolbar.setAttribute("customizable", true);
+  toolbar.setAttribute("defaultset", kButtonId);
+  gNavToolbox.appendChild(toolbar);
+  ok(CustomizableUI.areas.indexOf(kToolbarId) != -1,
+     "Toolbar should have been registered automatically.");
+  is(CustomizableUI.getAreaType(kToolbarId), CustomizableUI.TYPE_TOOLBAR,
+     "Area should be registered as toolbar");
+  assertAreaPlacements(kToolbarId, [kButtonId]);
+  ok(!CustomizableUI.inDefaultState, "No longer in default state after toolbar is registered and visible.");
+  CustomizableUI.unregisterArea(kToolbarId, true);
+  toolbar.remove();
+  ok(CustomizableUI.inDefaultState, "Everything should be in its default state.");
+  btn.remove();
+});
+
+// Registering a toolbar without a defaultset attribute should
+// wait for the registerArea call
+add_task(function*() {
+  ok(CustomizableUI.inDefaultState, "Everything should be in its default state.");
+  let btn = createDummyXULButton(kButtonId);
+  let toolbar = document.createElement("toolbar");
+  toolbar.id = kToolbarId;
+  toolbar.setAttribute("customizable", true);
+  gNavToolbox.appendChild(toolbar);
+  ok(CustomizableUI.areas.indexOf(kToolbarId) == -1,
+     "Toolbar should not yet have been registered automatically.");
+  CustomizableUI.registerArea(kToolbarId, {defaultPlacements: [kButtonId]});
+  ok(CustomizableUI.areas.indexOf(kToolbarId) != -1,
+     "Toolbar should have been registered now.");
+  is(CustomizableUI.getAreaType(kToolbarId), CustomizableUI.TYPE_TOOLBAR,
+     "Area should be registered as toolbar");
+  assertAreaPlacements(kToolbarId, [kButtonId]);
+  ok(!CustomizableUI.inDefaultState, "No longer in default state after toolbar is registered and visible.");
+  CustomizableUI.unregisterArea(kToolbarId, true);
+  toolbar.remove();
+  ok(CustomizableUI.inDefaultState, "Everything should be in its default state.");
+  btn.remove();
+});
+
+add_task(function* asyncCleanup() {
+  yield resetCustomization();
+});
+
+function cleanup() {
+  let toolbar = document.getElementById(kToolbarId);
+  if (toolbar) {
+    toolbar.remove();
+  }
+  let btn = document.getElementById(kButtonId) ||
+            gNavToolbox.querySelector("#" + kButtonId);
+  if (btn) {
+    btn.remove();
+  }
+}