diff --git a/mass_mailing_resend/__init__.py b/mass_mailing_resend/__init__.py index a77a6fc..83e553a 100644 --- a/mass_mailing_resend/__init__.py +++ b/mass_mailing_resend/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/mass_mailing_resend/__manifest__.py b/mass_mailing_resend/__manifest__.py index 9b97a6c..fc1d1c6 100644 --- a/mass_mailing_resend/__manifest__.py +++ b/mass_mailing_resend/__manifest__.py @@ -7,15 +7,10 @@ "version": "12.0.1.0.0", "category": "Marketing", "website": "https://github.com/OCA/social", - "author": "Tecnativa, " - "Odoo Community Association (OCA)", + "author": "Tecnativa, " "Odoo Community Association (OCA)", "license": "AGPL-3", "application": False, "installable": True, - "depends": [ - "mass_mailing", - ], - "data": [ - "views/mass_mailing_views.xml", - ], + "depends": ["mass_mailing"], + "data": ["views/mass_mailing_views.xml"], } diff --git a/mass_mailing_resend/models/mass_mailing.py b/mass_mailing_resend/models/mass_mailing.py index baec0e5..8a9e49d 100644 --- a/mass_mailing_resend/models/mass_mailing.py +++ b/mass_mailing_resend/models/mass_mailing.py @@ -10,9 +10,11 @@ class MailMassMailingList(models.Model): def button_draft(self): """Return to draft state for resending the mass mailing.""" - if any(self.mapped(lambda x: x.state != 'done')): + if any(self.mapped(lambda x: x.state != "done")): raise exceptions.UserError( - _("You can't resend a mass mailing that is being sent or in " - "draft state.") + _( + "You can't resend a mass mailing that is being sent or in " + "draft state." + ) ) - self.write({'state': 'draft'}) + self.write({"state": "draft"}) diff --git a/mass_mailing_resend/tests/test_mass_mailing_resend.py b/mass_mailing_resend/tests/test_mass_mailing_resend.py index c6c10dc..02bd692 100644 --- a/mass_mailing_resend/tests/test_mass_mailing_resend.py +++ b/mass_mailing_resend/tests/test_mass_mailing_resend.py @@ -1,37 +1,36 @@ # Copyright 2017-2018 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo.tests import common from odoo import exceptions +from odoo.tests import common class TestMassMailingResend(common.SavepointCase): @classmethod def setUpClass(cls): super(TestMassMailingResend, cls).setUpClass() - cls.list = cls.env['mail.mass_mailing.list'].create({ - 'name': 'Test list', - }) - cls.contact1 = cls.env['mail.mass_mailing.contact'].create({ - 'name': 'Contact 1', - 'email': 'email1@test.com', - }) - cls.mass_mailing = cls.env['mail.mass_mailing'].create({ - 'name': 'Test mass mailing', - 'email_from': 'test@example.org', - 'mailing_model_id': cls.env.ref( - 'mass_mailing.model_mail_mass_mailing_contact' - ).id, - 'contact_list_ids': [(6, 0, cls.list.ids)], - 'reply_to_mode': 'thread', - }) + cls.list = cls.env["mail.mass_mailing.list"].create({"name": "Test list"}) + cls.contact1 = cls.env["mail.mass_mailing.contact"].create( + {"name": "Contact 1", "email": "email1@test.com"} + ) + cls.mass_mailing = cls.env["mail.mass_mailing"].create( + { + "name": "Test mass mailing", + "email_from": "test@example.org", + "mailing_model_id": cls.env.ref( + "mass_mailing.model_mail_mass_mailing_contact" + ).id, + "contact_list_ids": [(6, 0, cls.list.ids)], + "reply_to_mode": "thread", + } + ) def test_resend_error(self): with self.assertRaises(exceptions.UserError): self.mass_mailing.button_draft() def test_resend(self): - self.mass_mailing.state = 'done' # Force state - self.assertEqual(self.mass_mailing.state, 'done') + self.mass_mailing.state = "done" # Force state + self.assertEqual(self.mass_mailing.state, "done") self.mass_mailing.button_draft() - self.assertEqual(self.mass_mailing.state, 'draft') + self.assertEqual(self.mass_mailing.state, "draft")