[IMP] ..aware_sender: add test for server selection

NL66278 · NL66278 · commit 1e0115d80122 · 2026-02-23T14:44:16.000+01:00
diff --git a/mail_company_aware_sender/README.rst b/mail_company_aware_sender/README.rst
@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 =========================
 Mail Sender Company Aware
 =========================
@@ -13,7 +17,7 @@ Mail Sender Company Aware
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github
diff --git a/mail_company_aware_sender/static/description/index.html b/mail_company_aware_sender/static/description/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Mail Sender Company Aware</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
@@ -360,16 +360,21 @@
 </style>
 </head>
 <body>
-<div class="document" id="mail-sender-company-aware">
-<h1 class="title">Mail Sender Company Aware</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="mail-sender-company-aware">
+<h1>Mail Sender Company Aware</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:7ee2897c3172b5b4d4927dbf7ec1e94e1c71bc5602f7bdf85b3ac0cae33481d0
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/social/tree/14.0/mail_company_aware_sender"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/social-14-0/social-14-0-mail_company_aware_sender"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/social&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/social/tree/14.0/mail_company_aware_sender"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/social-14-0/social-14-0-mail_company_aware_sender"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/social&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows to send out mails using a company aware email address.
 Suppose we have a user Charles the Magnificent with email address
 <a class="reference external" href="mailto:charlemagne&#64;kingdom.fr">charlemagne&#64;kingdom.fr</a>. However this user works for two companies, one
@@ -401,7 +406,7 @@ <h1 class="title">Mail Sender Company Aware</h1>
 </ul>
 </div>
 <div class="section" id="configuration">
-<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Configuration</a></h2>
 <dl class="docutils">
 <dt>To send out mails with company aware from addresses, three things are needed:</dt>
 <dd><ul class="first last simple">
@@ -419,23 +424,23 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 emails. This can be configured right under the email field in the partner form.</p>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/social/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20mail_company_aware_sender%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-3">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-4">Authors</a></h3>
 <ul class="simple">
 <li>Therp BV</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
 <ul class="simple">
 <li><a class="reference external" href="https://therp.nl">Therp BV</a>:<ul>
 <li>Ronald Portier (NL66278)</li>
@@ -444,7 +449,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -457,5 +462,6 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>
diff --git a/mail_company_aware_sender/tests/common.py b/mail_company_aware_sender/tests/common.py
@@ -1,5 +1,7 @@
 # Copyright 2025 Therp BV <https://therp.nl>.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from email.utils import parseaddr
+
 from odoo.tests.common import SavepointCase
 
 
@@ -17,6 +19,7 @@ def setUpClass(cls):
                 "name": "localhost",
                 "smtp_host": "localhost",
                 "domain_whitelist": "therp.nl",
+                "sequence": 99,
             }
         )
         cls.company_kingdom = cls.Company.create(
@@ -58,3 +61,10 @@ def setUpClass(cls):
                 "company_id": cls.company_imperium.id,
             }
         )
+
+    def _assert_email(self, email_from, expected_email, expected_name=None):
+        """Assert email_from matches expected parts, tolerant to quoting differences."""
+        name, email = parseaddr(email_from or "")
+        self.assertEqual(email, expected_email)
+        if expected_name is not None:
+            self.assertEqual(name, expected_name)
diff --git a/mail_company_aware_sender/tests/test_company_aware_sender.py b/mail_company_aware_sender/tests/test_company_aware_sender.py
@@ -1,18 +1,10 @@
 # Copyright 2025 Therp BV <https://therp.nl>.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from email.utils import parseaddr
 
 from .common import CompanyAwareSenderCase
 
 
 class TestCompanyAwareSender(CompanyAwareSenderCase):
-    def _assert_email(self, email_from, expected_email, expected_name=None):
-        """Assert email_from matches expected parts, tolerant to quoting differences."""
-        name, email = parseaddr(email_from or "")
-        self.assertEqual(email, expected_email)
-        if expected_name is not None:
-            self.assertEqual(name, expected_name)
-
     def test_nothing_changed(self):
         # Check with default user and author (current user).
         mail_thread = (
diff --git a/mail_company_aware_sender/tests/test_mail_server.py b/mail_company_aware_sender/tests/test_mail_server.py
@@ -1,20 +1,12 @@
-# Copyright 2025 Therp BV <https://therp.nl>.
+# Copyright 2025-2026 Therp BV <https://therp.nl>.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from email.utils import parseaddr
 
 from odoo.exceptions import ValidationError
 
 from .common import CompanyAwareSenderCase
 
 
 class TestMailServer(CompanyAwareSenderCase):
-    def _assert_email(self, email_from, expected_email, expected_name=None):
-        """Assert email_from matches expected parts, tolerant to quoting differences."""
-        name, email = parseaddr(email_from or "")
-        self.assertEqual(email, expected_email)
-        if expected_name is not None:
-            self.assertEqual(name, expected_name)
-
     def test_test_email_adresses(self):
         # Whitelist domain, and enable from address.
         self.mail_server.write(
@@ -54,3 +46,43 @@ def test_disable_encapsulation(self):
             self.company_imperium
         )._get_default_from_address()
         self.assertEqual(email_from, None)
+
+    def test_email_server_selection(self):
+        # When one server has domain whitelisted, that server should send message.
+        self.IrMailServer.create(
+            {
+                "name": "default mail server",
+                "smtp_host": "localhost",
+                "domain_whitelist": "therp.nl",
+                "sequence": 5,
+            }
+        )
+        # First test with smtp_from.
+        self.mail_server.write(
+            {
+                "smtp_from": "info@imperiumromanum.org",
+                "domain_whitelist": "imperiumromanum.org",
+            }
+        )
+        # Partner charles in imperium should use company aware from.
+        email_from, email_to = (
+            self.mail_server.with_user(self.user_charles)
+            .with_company(self.company_imperium)
+            ._get_test_email_addresses()
+        )
+        self._assert_email(email_from, "info@imperiumromanum.org")
+        # Call the (misspelled) _get_mail_sever method, defined in the
+        # mail_outbound_static module, to select the right mail server.
+        mail_server_id = self.IrMailServer._get_mail_sever("imperiumromanum.org")
+        # The server with the domain should be used, despite higher sequence.
+        self.assertEqual(mail_server_id, self.mail_server.id)
+        # Now test with no smtp_from.
+        self.mail_server.write({"smtp_from": False})
+        email_from, email_to = (
+            self.mail_server.with_user(self.user_charles)
+            .with_company(self.company_imperium)
+            ._get_test_email_addresses()
+        )
+        self._assert_email(email_from, "charlemagne@imperiumromanum.org")
+        mail_server_id = self.IrMailServer._get_mail_sever("imperiumromanum.org")
+        self.assertEqual(mail_server_id, self.mail_server.id)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`# Copyright 2025 Therp BV <https://therp.nl>.`
`2`	`2`	`# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).`
	`3`	`+from email.utils import parseaddr`
	`4`	`+`
`3`	`5`	`from odoo.tests.common import SavepointCase`
`4`	`6`
`5`	`7`
`@@ -17,6 +19,7 @@ def setUpClass(cls):`
`17`	`19`	`"name": "localhost",`
`18`	`20`	`"smtp_host": "localhost",`
`19`	`21`	`"domain_whitelist": "therp.nl",`
	`22`	`+ "sequence": 99,`
`20`	`23`	`}`
`21`	`24`	`)`
`22`	`25`	`cls.company_kingdom = cls.Company.create(`
`@@ -58,3 +61,10 @@ def setUpClass(cls):`
`58`	`61`	`"company_id": cls.company_imperium.id,`
`59`	`62`	`}`
`60`	`63`	`)`
	`64`	`+`
	`65`	`+ def _assert_email(self, email_from, expected_email, expected_name=None):`
	`66`	`+ """Assert email_from matches expected parts, tolerant to quoting differences."""`
	`67`	`+ name, email = parseaddr(email_from or "")`
	`68`	`+ self.assertEqual(email, expected_email)`
	`69`	`+ if expected_name is not None:`
	`70`	`+ self.assertEqual(name, expected_name)`