ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+MPHfW8vX4CgPA9taZb1mBMAs/IJYfo41AHEi6N46i m.francke@secure42.de

[IMP] increase test coverage

[IMP] increase test coverage

[IMP] increase test coverage

fghf

fgghf

dfdfg

dffg

Author: mathiasfrancke

mail_quoted_reply/tests/test_reply.py

@@ -71,6 +71,49 @@ def test_unquoted_reply(self):
         wizard = (
             self.env[action["res_model"]].with_context(**action["context"]).create({})
         )
+        wizard = wizard.with_context(
+            default_subject="Some subject for testing purposes",
+        )
+        self.assertTrue(wizard.partner_ids)
+        self.assertEqual(message.email_from, wizard.partner_ids.email_formatted)
+        # the onchange in the composer isn't triggered in tests, so we check for the
+        # correct quote in the context
+        email_quote = re.search("<p>.*?</p>", wizard.env.context["quote_body"]).group()
+        self.assertEqual("<p>demo message</p>", email_quote)
+        wizard.action_send_mail()
+        new_message = partner.message_ids.filtered(
+            lambda r: r.message_type != "notification" and r != message
+        )
+        self.assertTrue(new_message)
+        self.assertEqual(1, len(new_message))
+
+    def test_reply_with_existing_body(self):
+        partner = self.env["res.partner"].create({"name": "demo partner"})
+        self.assertFalse(
+            partner.message_ids.filtered(lambda r: r.message_type != "notification")
+        )
+        # pylint: disable=C8107
+        message = partner.message_post(
+            body="demo message",
+            message_type="email",
+            partner_ids=self.env.ref("base.partner_admin").ids,
+        )
+        partner.invalidate_recordset()
+        self.assertIn(
+            message,
+            partner.message_ids.filtered(lambda r: r.message_type != "notification"),
+        )
+        self.assertFalse(
+            partner.message_ids.filtered(
+                lambda r: r.message_type != "notification" and r != message
+            )
+        )
+        action = message.reply_message()
+        action["context"]["is_quoted_reply"] = False
+        wizard = (
+            self.env[action["res_model"]].with_context(**action["context"]).create({})
+        )
+        wizard.body = "Some body for testing purposes"
         self.assertTrue(wizard.partner_ids)
         self.assertEqual(message.email_from, wizard.partner_ids.email_formatted)
         # the onchange in the composer isn't triggered in tests, so we check for the

mail_quoted_reply/wizard/mail_compose_message.py

@@ -1,6 +1,6 @@
 from markupsafe import Markup
 
-from odoo import api, models, tools
+from odoo import api, models
 
 
 class MailComposeMessage(models.TransientModel):
@@ -31,7 +31,8 @@ def _compute_body(self):
     def _compute_subject(self):
         res = super()._compute_subject()
         for composer in self:
-            subj = composer.env.context.get("default_subject", False)
+            context = composer.env.context
+            subj = context.get("default_subject", False)
             if subj:
-                composer.subject = tools.ustr(subj)
+                composer.subject = str(subj)
         return res