1 files changed, 90 insertions, 0 deletions
diff --git a/comm/mail/test/browser/composition/browser_replyFormatFlowed.js b/comm/mail/test/browser/composition/browser_replyFormatFlowed.js
new file mode 100644
index 0000000000..8f4f286739
--- /dev/null
+++ b/comm/mail/test/browser/composition/browser_replyFormatFlowed.js
@@ -0,0 +1,90 @@
+/* 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 reply to a format=flowed message is also flowed.
+ */
+
+"use strict";
+
+var {
+  close_compose_window,
+  get_msg_source,
+  open_compose_with_reply,
+  save_compose_message,
+} = ChromeUtils.import("resource://testing-common/mozmill/ComposeHelpers.jsm");
+var {
+  be_in_folder,
+  get_special_folder,
+  get_about_message,
+  open_message_from_file,
+  press_delete,
+  select_click_row,
+  select_none,
+} = ChromeUtils.import(
+  "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
+);
+var { close_window } = ChromeUtils.import(
+  "resource://testing-common/mozmill/WindowHelpers.jsm"
+);
+
+var { MailServices } = ChromeUtils.import(
+  "resource:///modules/MailServices.jsm"
+);
+
+var gDrafts;
+
+add_setup(async function () {
+  gDrafts = await get_special_folder(Ci.nsMsgFolderFlags.Drafts, true);
+
+  Services.prefs.setBoolPref("mail.identity.id1.compose_html", false);
+});
+
+async function subtest_reply_format_flowed(aFlowed) {
+  let file = new FileUtils.File(getTestFilePath("data/format-flowed.eml"));
+  let msgc = await open_message_from_file(file);
+
+  Services.prefs.setBoolPref("mailnews.send_plaintext_flowed", aFlowed);
+
+  let cwc = open_compose_with_reply(msgc);
+
+  close_window(msgc);
+
+  // Now save the message as a draft.
+  await save_compose_message(cwc.window);
+  close_compose_window(cwc);
+
+  await TestUtils.waitForCondition(
+    () => gDrafts.getTotalMessages(false) == 1,
+    "message saved to drafts folder"
+  );
+
+  // Now check the message content in the drafts folder.
+  await be_in_folder(gDrafts);
+  let message = select_click_row(0);
+  let messageContent = await get_msg_source(message);
+
+  // Check for a single line that contains text and make sure there is a
+  // space at the end for a flowed reply.
+  Assert.ok(
+    messageContent.includes(
+      "\r\n> text text text text text text text text text text text text text text" +
+        (aFlowed ? " \r\n" : "\r\n")
+    ),
+    "Expected line not found in message."
+  );
+
+  // Delete the outgoing message.
+  press_delete();
+}
+
+add_task(async function test_reply_format_flowed() {
+  await subtest_reply_format_flowed(true);
+  await subtest_reply_format_flowed(false);
+});
+
+registerCleanupFunction(function () {
+  Services.prefs.clearUserPref("mail.identity.id1.compose_html");
+  Services.prefs.clearUserPref("mailnews.send_plaintext_flowed");
+});