-
-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MIG] mail_outbound_static: migrate to V18
- Loading branch information
Showing
4 changed files
with
33 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,10 +8,11 @@ | |
|
||
/* | ||
:Author: David Goodger ([email protected]) | ||
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ | ||
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ | ||
:Copyright: This stylesheet has been placed in the public domain. | ||
Default cascading style sheet for the HTML output of Docutils. | ||
Despite the name, some widely supported CSS2 features are used. | ||
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to | ||
customize this style sheet. | ||
|
@@ -274,7 +275,7 @@ | |
margin-left: 2em ; | ||
margin-right: 2em } | ||
|
||
pre.code .ln { color: grey; } /* line numbers */ | ||
pre.code .ln { color: gray; } /* line numbers */ | ||
pre.code, code { background-color: #eeeeee } | ||
pre.code .comment, code .comment { color: #5C6576 } | ||
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } | ||
|
@@ -300,7 +301,7 @@ | |
span.pre { | ||
white-space: pre } | ||
|
||
span.problematic { | ||
span.problematic, pre.problematic { | ||
color: red } | ||
|
||
span.section-subtitle { | ||
|
@@ -368,7 +369,7 @@ <h1 class="title">Mail Outbound Static</h1> | |
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
!! source digest: sha256:51d25f22970569d2c95b0ea4b79c6a3b9aad9e27c05e8f2a8f53f87e71be5daa | ||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> | ||
<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/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/social/tree/17.0/mail_outbound_static"><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-17-0/social-17-0-mail_outbound_static"><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&target_branch=17.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/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/mail/tree/18.0/mail_outbound_static"><img alt="OCA/mail" src="https://img.shields.io/badge/github-OCA%2Fmail-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/mail-18-0/mail-18-0-mail_outbound_static"><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/mail&target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p> | ||
<p>This module brings Odoo outbound emails in to strict compliance with | ||
RFC-2822 by allowing for a dynamically configured From header, with the | ||
sender’s e-mail being appended into the proper Sender header instead. To | ||
|
@@ -422,10 +423,10 @@ <h1><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h1> | |
</div> | ||
<div class="section" id="bug-tracker"> | ||
<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1> | ||
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/social/issues">GitHub Issues</a>. | ||
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/mail/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_outbound_static%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p> | ||
<a class="reference external" href="https://github.com/OCA/mail/issues/new?body=module:%20mail_outbound_static%0Aversion:%2018.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"> | ||
|
@@ -456,11 +457,13 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2> | |
<div class="section" id="maintainers"> | ||
<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2> | ||
<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" /></a> | ||
<a class="reference external image-reference" href="https://odoo-community.org"> | ||
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /> | ||
</a> | ||
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose | ||
mission is to support the collaborative development of Odoo features and | ||
promote its widespread use.</p> | ||
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/17.0/mail_outbound_static">OCA/social</a> project on GitHub.</p> | ||
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/mail/tree/18.0/mail_outbound_static">OCA/mail</a> project on GitHub.</p> | ||
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p> | ||
</div> | ||
</div> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -125,7 +125,7 @@ def test_send_email_injects_from_with_canonical(self): | |
proper handling in the split. | ||
""" | ||
user = "Test < User" | ||
self.message.replace_header("From", "%s <[email protected]>" % user) | ||
self.message.replace_header("From", f"{user} <[email protected]>") | ||
bounce_parameter = self.parameter_model.search( | ||
[("key", "=", "mail.bounce.alias")] | ||
) | ||
|
@@ -145,7 +145,7 @@ def test_send_email_injects_from_with_canonical(self): | |
def test_01_from_outgoing_server_domainone(self): | ||
self._init_mail_server_domain_whilelist_based() | ||
domain = "domainone.com" | ||
email_from = "Mitchell Admin <admin@%s>" % domain | ||
email_from = f"Mitchell Admin <admin@{domain}>" | ||
expected_mail_server = self.mail_server_domainone | ||
|
||
self.message.replace_header("From", email_from) | ||
|
@@ -168,7 +168,7 @@ def test_01_from_outgoing_server_domainone(self): | |
def test_02_from_outgoing_server_domaintwo(self): | ||
self._init_mail_server_domain_whilelist_based() | ||
domain = "domaintwo.com" | ||
email_from = "Mitchell Admin <admin@%s>" % domain | ||
email_from = f"Mitchell Admin <admin@{domain}>" | ||
expected_mail_server = self.mail_server_domaintwo | ||
|
||
self.message.replace_header("From", email_from) | ||
|
@@ -191,15 +191,15 @@ def test_02_from_outgoing_server_domaintwo(self): | |
def test_03_from_outgoing_server_another(self): | ||
self._init_mail_server_domain_whilelist_based() | ||
domain = "example.com" | ||
email_from = "Mitchell Admin <admin@%s>" % domain | ||
email_from = f"Mitchell Admin <admin@{domain}>" | ||
expected_mail_server = self.mail_server_domainone | ||
|
||
self.message.replace_header("From", email_from) | ||
# A mail server is configured for the email | ||
with self.mock_smtplib_connection(): | ||
message = self._send_mail(self.message) | ||
self.assertEqual( | ||
message["From"], "Mitchell Admin <%s>" % expected_mail_server.smtp_from | ||
message["From"], f"Mitchell Admin <{expected_mail_server.smtp_from}>" | ||
) | ||
|
||
used_mail_server = self.IrMailServer._get_mail_sever(domain) | ||
|
@@ -216,7 +216,7 @@ def test_03_from_outgoing_server_another(self): | |
def test_04_from_outgoing_server_none_use_config(self): | ||
self._init_mail_server_domain_whilelist_based() | ||
domain = "example.com" | ||
email_from = "Mitchell Admin <admin@%s>" % domain | ||
email_from = f"Mitchell Admin <admin@{domain}>" | ||
|
||
self._delete_mail_servers() | ||
self.assertFalse(self.IrMailServer.search([])) | ||
|
@@ -233,12 +233,12 @@ def test_04_from_outgoing_server_none_use_config(self): | |
# A mail server is configured for the email | ||
with self.mock_smtplib_connection(): | ||
message = self._send_mail(self.message) | ||
self.assertEqual(message["From"], "Mitchell Admin <%s>" % config_smtp_from) | ||
self.assertEqual(message["From"], f"Mitchell Admin <{config_smtp_from}>") | ||
|
||
used_mail_server = self.IrMailServer._get_mail_sever("example.com") | ||
used_mail_server = self.IrMailServer.browse(used_mail_server) | ||
self.assertFalse( | ||
used_mail_server, "using this mail server %s" % (used_mail_server.name) | ||
used_mail_server, f"using this mail server {used_mail_server.name}" | ||
) | ||
|
||
def test_05_from_outgoing_server_none_same_domain(self): | ||
|
@@ -255,7 +255,7 @@ def test_05_from_outgoing_server_none_same_domain(self): | |
" or smtp_domain_whitelist." | ||
) | ||
|
||
email_from = "Mitchell Admin <admin@%s>" % domain | ||
email_from = f"Mitchell Admin <admin@{domain}>" | ||
|
||
self._delete_mail_servers() | ||
self.assertFalse(self.IrMailServer.search([])) | ||
|
@@ -272,7 +272,7 @@ def test_05_from_outgoing_server_none_same_domain(self): | |
def test_06_from_outgoing_server_no_name_from(self): | ||
self._init_mail_server_domain_whilelist_based() | ||
domain = "example.com" | ||
email_from = "test@%s" % domain | ||
email_from = f"test@{domain}" | ||
expected_mail_server = self.mail_server_domainone | ||
|
||
self.message.replace_header("From", email_from) | ||
|
@@ -295,7 +295,7 @@ def test_06_from_outgoing_server_no_name_from(self): | |
def test_07_from_outgoing_server_multidomain_1(self): | ||
self._init_mail_server_domain_whilelist_based() | ||
domain = "domainthree.com" | ||
email_from = "Mitchell Admin <admin@%s>" % domain | ||
email_from = f"Mitchell Admin <admin@{domain}>" | ||
expected_mail_server = self.mail_server_domainthree | ||
|
||
self.message.replace_header("From", email_from) | ||
|
@@ -318,7 +318,7 @@ def test_07_from_outgoing_server_multidomain_1(self): | |
def test_08_from_outgoing_server_multidomain_3(self): | ||
self._init_mail_server_domain_whilelist_based() | ||
domain = "domainmulti.com" | ||
email_from = "test@%s" % domain | ||
email_from = f"test@{domain}" | ||
expected_mail_server = self.mail_server_domainthree | ||
|
||
self.message.replace_header("From", email_from) | ||
|