2 files changed, 32 insertions, 0 deletions
diff --git a/comm/mail/test/browser/override-main-menu-collapse/browser.ini b/comm/mail/test/browser/override-main-menu-collapse/browser.ini
new file mode 100644
index 0000000000..ec463c34be
--- /dev/null
+++ b/comm/mail/test/browser/override-main-menu-collapse/browser.ini
@@ -0,0 +1,13 @@
+[DEFAULT]
+prefs =
+  mail.main_menu.collapse_by_default=false
+  mail.provider.suppress_dialog_on_startup=true
+  mail.spotlight.firstRunDone=true
+  mail.winsearch.firstRunDone=true
+  mailnews.start_page.override_url=about:blank
+  mailnews.start_page.url=about:blank
+  datareporting.policy.dataSubmissionPolicyBypassNotification=true
+subsuite = thunderbird
+
+[browser_overrideMainmenuCollapse.js]
+skip-if = os == "mac"
diff --git a/comm/mail/test/browser/override-main-menu-collapse/browser_overrideMainmenuCollapse.js b/comm/mail/test/browser/override-main-menu-collapse/browser_overrideMainmenuCollapse.js
new file mode 100644
index 0000000000..5a7c9393f4
--- /dev/null
+++ b/comm/mail/test/browser/override-main-menu-collapse/browser_overrideMainmenuCollapse.js
@@ -0,0 +1,19 @@
+/* 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/. */
+
+/**
+ * Tests that the main menu will NOT be collapsed by default if Thunderbird
+ * starts with no accounts created, and mail.main_menu.collapse_by_default set
+ * to false.
+ */
+
+"use strict";
+
+add_task(function test_main_menu_not_collapsed() {
+  let mainMenu = document.getElementById("toolbar-menubar");
+  Assert.ok(
+    !mainMenu.hasAttribute("autohide"),
+    "The main menu should not have the autohide attribute."
+  );
+});