From 26a029d407be480d791972afb5975cf62c9360a6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 02:47:55 +0200
Subject: Adding upstream version 124.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../test/browser_toolbar_collapsed_states.js       | 112 +++++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 browser/components/customizableui/test/browser_toolbar_collapsed_states.js

(limited to 'browser/components/customizableui/test/browser_toolbar_collapsed_states.js')

diff --git a/browser/components/customizableui/test/browser_toolbar_collapsed_states.js b/browser/components/customizableui/test/browser_toolbar_collapsed_states.js
new file mode 100644
index 0000000000..23da60a7d5
--- /dev/null
+++ b/browser/components/customizableui/test/browser_toolbar_collapsed_states.js
@@ -0,0 +1,112 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * Checks that CustomizableUI reports the expected collapsed toolbar IDs.
+ *
+ * Note: on macOS, expectations for CustomizableUI.AREA_MENUBAR are
+ * automatically skipped since that area isn't available on that platform.
+ *
+ * @param {string[]} The IDs of the expected collapsed toolbars.
+ */
+function assertCollapsedToolbarIds(expected) {
+  if (AppConstants.platform == "macosx") {
+    let menubarIndex = expected.indexOf(CustomizableUI.AREA_MENUBAR);
+    if (menubarIndex != -1) {
+      expected.splice(menubarIndex, 1);
+    }
+  }
+
+  let collapsedIds = CustomizableUI.getCollapsedToolbarIds(window);
+  Assert.equal(collapsedIds.size, expected.length);
+  for (let expectedId of expected) {
+    Assert.ok(
+      collapsedIds.has(expectedId),
+      `${expectedId} should be collapsed`
+    );
+  }
+}
+
+registerCleanupFunction(async () => {
+  await CustomizableUI.reset();
+});
+
+/**
+ * Tests that CustomizableUI.getCollapsedToolbarIds will return the IDs of
+ * toolbars that are collapsed, or menubars that are autohidden.
+ */
+add_task(async function test_toolbar_collapsed_states() {
+  // By default, we expect the menubar and the bookmarks toolbar to be
+  // collapsed.
+  assertCollapsedToolbarIds([
+    CustomizableUI.AREA_BOOKMARKS,
+    CustomizableUI.AREA_MENUBAR,
+  ]);
+
+  let bookmarksToolbar = document.getElementById(CustomizableUI.AREA_BOOKMARKS);
+  // Make sure we're configured to show the bookmarks toolbar on about:newtab.
+  setToolbarVisibility(bookmarksToolbar, "newtab");
+
+  let newTab = await BrowserTestUtils.openNewForegroundTab({
+    gBrowser,
+    opening: "about:newtab",
+    waitForLoad: false,
+  });
+  // Now that we've opened about:newtab, the bookmarks toolbar should now
+  // be visible.
+  assertCollapsedToolbarIds([CustomizableUI.AREA_MENUBAR]);
+  await BrowserTestUtils.removeTab(newTab);
+
+  // And with about:newtab closed again, the bookmarks toolbar should be
+  // reported as collapsed.
+  assertCollapsedToolbarIds([
+    CustomizableUI.AREA_BOOKMARKS,
+    CustomizableUI.AREA_MENUBAR,
+  ]);
+
+  // Make sure we're configured to show the bookmarks toolbar on about:newtab.
+  setToolbarVisibility(bookmarksToolbar, "always");
+  assertCollapsedToolbarIds([CustomizableUI.AREA_MENUBAR]);
+
+  setToolbarVisibility(bookmarksToolbar, "never");
+  assertCollapsedToolbarIds([
+    CustomizableUI.AREA_BOOKMARKS,
+    CustomizableUI.AREA_MENUBAR,
+  ]);
+
+  if (AppConstants.platform != "macosx") {
+    // We'll still consider the menubar collapsed by default, even if it's being temporarily
+    // shown via the alt key.
+    let menubarActive = BrowserTestUtils.waitForEvent(
+      window,
+      "DOMMenuBarActive"
+    );
+    EventUtils.synthesizeKey("VK_ALT", {});
+    await menubarActive;
+    assertCollapsedToolbarIds([
+      CustomizableUI.AREA_BOOKMARKS,
+      CustomizableUI.AREA_MENUBAR,
+    ]);
+    let menubarInactive = BrowserTestUtils.waitForEvent(
+      window,
+      "DOMMenuBarInactive"
+    );
+    EventUtils.synthesizeKey("VK_ESCAPE", {});
+    await menubarInactive;
+    assertCollapsedToolbarIds([
+      CustomizableUI.AREA_BOOKMARKS,
+      CustomizableUI.AREA_MENUBAR,
+    ]);
+
+    let menubar = document.getElementById(CustomizableUI.AREA_MENUBAR);
+    setToolbarVisibility(menubar, true);
+    assertCollapsedToolbarIds([CustomizableUI.AREA_BOOKMARKS]);
+    setToolbarVisibility(menubar, false);
+    assertCollapsedToolbarIds([
+      CustomizableUI.AREA_BOOKMARKS,
+      CustomizableUI.AREA_MENUBAR,
+    ]);
+  }
+});
-- 
cgit v1.2.3