From 6cc336e705379fa936faceade8ddc89953813a2e Mon Sep 17 00:00:00 2001 From: yajo Date: Thu, 7 Jul 2022 07:20:18 +0000 Subject: [PATCH 1/2] [FIX] mail_autosubscribe: missing dependency This should fix the tests, that are currently failing on CI with: ``` 2022-07-05 16:19:13,250 259 INFO odoo odoo.service.server: Starting post tests 2022-07-05 16:19:13,253 259 ERROR odoo odoo.tests.loader: Can not `import mail_autosubscribe`. Traceback (most recent call last): File "/opt/odoo/odoo/tests/loader.py", line 33, in _get_tests_modules mod = importlib.import_module('.tests', modpath) File "/usr/lib/python3.8/importlib/__init__.py", line 127, in import_module return _bootstrap._gcd_import(name[level:], package, level) File "", line 1014, in _gcd_import File "", line 991, in _find_and_load File "", line 975, in _find_and_load_unlocked File "", line 671, in _load_unlocked File "", line 848, in exec_module File "", line 219, in _call_with_frames_removed File "/__w/social/social/mail_autosubscribe/tests/__init__.py", line 1, in from . import test_mail_autosubscribe File "/__w/social/social/mail_autosubscribe/tests/test_mail_autosubscribe.py", line 5, in from odoo_test_helper import FakeModelLoader ModuleNotFoundError: No module named 'odoo_test_helper' ``` --- mail_autosubscribe/__manifest__.py | 3 +++ mail_autosubscribe/readme/CONTRIBUTORS.rst | 4 ++++ requirements.txt | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 requirements.txt diff --git a/mail_autosubscribe/__manifest__.py b/mail_autosubscribe/__manifest__.py index 2a9e5d6..0183c34 100644 --- a/mail_autosubscribe/__manifest__.py +++ b/mail_autosubscribe/__manifest__.py @@ -10,6 +10,9 @@ "license": "AGPL-3", "category": "Marketing", "depends": ["mail"], + "external_dependencies": { + "python": ["odoo_test_helper"], + }, "website": "https://github.com/OCA/social", "data": [ "security/ir.model.access.csv", diff --git a/mail_autosubscribe/readme/CONTRIBUTORS.rst b/mail_autosubscribe/readme/CONTRIBUTORS.rst index df7472d..0024277 100644 --- a/mail_autosubscribe/readme/CONTRIBUTORS.rst +++ b/mail_autosubscribe/readme/CONTRIBUTORS.rst @@ -1,3 +1,7 @@ * `Camptocamp `_ * Iván Todorovich + +* `Moduon `__ + + * Jairo Llopis diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..fb06c6f --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +# generated from manifests external_dependencies +odoo_test_helper From 59aca57293d8c306e2252cd168555bd848b3a99e Mon Sep 17 00:00:00 2001 From: nicolas Date: Fri, 8 Jul 2022 08:31:34 -0300 Subject: [PATCH 2/2] [FIX] mail_autosubscribe: fix email template --- mail_autosubscribe/tests/test_mail_autosubscribe.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mail_autosubscribe/tests/test_mail_autosubscribe.py b/mail_autosubscribe/tests/test_mail_autosubscribe.py index 6c16f03..27969c8 100644 --- a/mail_autosubscribe/tests/test_mail_autosubscribe.py +++ b/mail_autosubscribe/tests/test_mail_autosubscribe.py @@ -28,8 +28,8 @@ class TestMailAutosubscribe(TransactionCase): { "model_id": cls.fake_order_model.id, "name": "Fake Order: Send by Mail", - "subject": "Fake Order: ${object.partner_id.name}", - "partner_to": "${object.partner_id.id}", + "subject": "Fake Order: {{object.partner_id.name}}", + "partner_to": "{{object.partner_id.id}}", "body_html": "Hello, this is a fake order", } ) @@ -111,7 +111,7 @@ class TestMailAutosubscribe(TransactionCase): default_composition_mode="comment", ) ) - composer.save().send_mail() + composer.save().action_send_mail() message = self.order.message_ids[0] self.assertEqual(message.partner_ids, self.partner_2 | self.partner_3) @@ -127,6 +127,6 @@ class TestMailAutosubscribe(TransactionCase): default_composition_mode="comment", ) ) - composer.save().send_mail() + composer.save().action_send_mail() message = self.order.message_ids[0] self.assertEqual(message.partner_ids, self.partner_2)