From dd9abe6a764291787db40b9a3f284305953ee5ca Mon Sep 17 00:00:00 2001 From: MAHAMADASIF ANSARI Date: Tue, 19 Jul 2022 11:12:10 +0000 Subject: [PATCH] [IMP] digest, test_mass_mailing: adapt test cases due to changes in templates With this PR, the `digest_data` template is changed, so many test cases fail. This commit adapts the test cases by changing the `data-field` from `div` to `table`. task-2717426 Part-of: odoo/odoo#89549 --- addons/digest/tests/test_digest.py | 2 +- addons/test_mass_mailing/tests/test_mailing_statistics.py | 4 ++-- addons/test_mass_mailing/tests/test_mailing_statistics_sms.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/digest/tests/test_digest.py b/addons/digest/tests/test_digest.py index c1a4c3b819c..920e03e16f6 100644 --- a/addons/digest/tests/test_digest.py +++ b/addons/digest/tests/test_digest.py @@ -94,7 +94,7 @@ class TestDigest(mail_test.MailCommon): self.assertEqual(mail.email_from, self.company_admin.email_formatted) self.assertEqual(mail.state, 'outgoing', 'Mail should use the queue') - kpi_message_values = html.fromstring(mail.body_html).xpath('//div[@data-field="kpi_mail_message_total"]//*[hasclass("kpi_value")]/text()') + kpi_message_values = html.fromstring(mail.body_html).xpath('//table[@data-field="kpi_mail_message_total"]//*[hasclass("kpi_value")]/text()') self.assertEqual( [t.strip() for t in kpi_message_values], ['3', '8', '15'] diff --git a/addons/test_mass_mailing/tests/test_mailing_statistics.py b/addons/test_mass_mailing/tests/test_mailing_statistics.py index c88695455b5..527eea1b32d 100644 --- a/addons/test_mass_mailing/tests/test_mailing_statistics.py +++ b/addons/test_mass_mailing/tests/test_mailing_statistics.py @@ -66,13 +66,13 @@ class TestMailingStatistics(TestMassMailCommon): self.assertEqual(mail.state, 'outgoing') # test body content: KPIs body_html = html.fromstring(mail.body_html) - kpi_values = body_html.xpath('//div[@data-field="mail"]//*[hasclass("kpi_value")]/text()') + kpi_values = body_html.xpath('//table[@data-field="mail"]//*[hasclass("kpi_value")]/text()') self.assertEqual( [t.strip().strip('%') for t in kpi_values], ['100', str(mailing.opened_ratio), str(mailing.replied_ratio)] ) # test body content: clicks (a bit hackish but hey we are in stable) - kpi_click_values = body_html.xpath('//div[hasclass("global_layout")]/table//tr[contains(@style,"color: #888888")]/td[contains(@style,"width: 30%")]/text()') + kpi_click_values = body_html.xpath('//table//tr[contains(@style,"color: #888888")]/td[contains(@style,"width: 30%")]/text()') first_link_value = int(kpi_click_values[0].strip().split()[1].strip('()')) self.assertEqual(first_link_value, mailing.clicked) diff --git a/addons/test_mass_mailing/tests/test_mailing_statistics_sms.py b/addons/test_mass_mailing/tests/test_mailing_statistics_sms.py index d20e3cc31d7..1291273e2f1 100644 --- a/addons/test_mass_mailing/tests/test_mailing_statistics_sms.py +++ b/addons/test_mass_mailing/tests/test_mailing_statistics_sms.py @@ -60,12 +60,12 @@ class TestMailingStatistics(TestMassSMSCommon): self.assertEqual(mail.state, 'outgoing') # test body content: KPIs body_html = html.fromstring(mail.body_html) - kpi_values = body_html.xpath('//div[@data-field="sms"]//*[hasclass("kpi_value")]/text()') + kpi_values = body_html.xpath('//table[@data-field="sms"]//*[hasclass("kpi_value")]/text()') self.assertEqual( [t.strip().strip('%') for t in kpi_values], ['100', str(mailing.opened_ratio), str(mailing.replied_ratio)] ) # test body content: clicks (a bit hackish but hey we are in stable) - kpi_click_values = body_html.xpath('//div[hasclass("global_layout")]/table//tr[contains(@style,"color: #888888")]/td[contains(@style,"width: 30%")]/text()') + kpi_click_values = body_html.xpath('//table//tr[contains(@style,"color: #888888")]/td[contains(@style,"width: 30%")]/text()') first_link_value = int(kpi_click_values[0].strip().split()[1].strip('()')) self.assertEqual(first_link_value, mailing.clicked)