4 files changed, 95 insertions, 0 deletions
diff --git a/comm/mail/test/browser/cookies/browser.ini b/comm/mail/test/browser/cookies/browser.ini
new file mode 100644
index 0000000000..d30977da39
--- /dev/null
+++ b/comm/mail/test/browser/cookies/browser.ini
@@ -0,0 +1,12 @@
+[DEFAULT]
+prefs =
+  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
+support-files = html/**
+
+[browser_cookies.js]
diff --git a/comm/mail/test/browser/cookies/browser_cookies.js b/comm/mail/test/browser/cookies/browser_cookies.js
new file mode 100644
index 0000000000..3237e5d2af
--- /dev/null
+++ b/comm/mail/test/browser/cookies/browser_cookies.js
@@ -0,0 +1,57 @@
+/* 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/. */
+
+/**
+ * Test file to check that cookies are correctly enabled in Thunderbird.
+ *
+ * XXX: Still need to check remote content in messages.
+ */
+
+"use strict";
+
+var { open_content_tab_with_url } = ChromeUtils.import(
+  "resource://testing-common/mozmill/ContentTabHelpers.jsm"
+);
+var { mc } = ChromeUtils.import(
+  "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
+);
+
+// RELATIVE_ROOT messes with the collector, so we have to bring the path back
+// so we get the right path for the resources.
+var url = "http://mochi.test:8888/browser/comm/mail/test/browser/cookies/html/";
+
+/**
+ * Test deleting junk messages with no messages marked as junk.
+ */
+add_task(async function test_load_cookie_page() {
+  open_content_tab_with_url(url + "cookietest1.html");
+  let tab2 = open_content_tab_with_url(url + "cookietest2.html");
+
+  await SpecialPowers.spawn(tab2.browser, [], () => {
+    Assert.equal(content.document.title, "Cookie Test 2");
+
+    let cookie = content.wrappedJSObject.theCookie;
+
+    dump("Cookie is: " + cookie + "\n");
+
+    if (!cookie) {
+      throw new Error("Document has no cookie :-(");
+    }
+
+    if (cookie != "name=CookieTest") {
+      throw new Error(
+        "Cookie set incorrectly, expected: name=CookieTest, got: " +
+          cookie +
+          "\n"
+      );
+    }
+  });
+
+  Assert.report(
+    false,
+    undefined,
+    undefined,
+    "Test ran to completion successfully"
+  );
+});
diff --git a/comm/mail/test/browser/cookies/html/cookietest1.html b/comm/mail/test/browser/cookies/html/cookietest1.html
new file mode 100644
index 0000000000..6df57f2c98
--- /dev/null
+++ b/comm/mail/test/browser/cookies/html/cookietest1.html
@@ -0,0 +1,13 @@
+<html>
+  <head>
+    <title>Cookie Test</title>
+    <script>
+      document.cookie = "name=CookieTest";
+    </script>
+  </head>
+  <body bgcolor="#FFFFFF">
+    <div align="center">
+      <h1>Cookie Test</h1>
+    </div>
+  </body>
+</html>
diff --git a/comm/mail/test/browser/cookies/html/cookietest2.html b/comm/mail/test/browser/cookies/html/cookietest2.html
new file mode 100644
index 0000000000..9086c346d1
--- /dev/null
+++ b/comm/mail/test/browser/cookies/html/cookietest2.html
@@ -0,0 +1,13 @@
+<html>
+  <head>
+    <title>Cookie Test 2</title>
+  </head>
+  <body bgcolor="#FFFFFF">
+    <script>
+      var theCookie = document.cookie;
+    </script>
+    <div align="center">
+      <h1>Cookie Test Result</h1>
+    </div>
+  </body>
+</html>