improve use of mocks in somenergia_soci_tests

Som-Energia · Nov 21, 2022 · 1fd9e28 · 1fd9e28
1 parent e27597b
commit 1fd9e28
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/som_generationkwh/tests/somenergia_soci_tests.py b/som_generationkwh/tests/somenergia_soci_tests.py
@@ -123,11 +123,12 @@ def test__arxiva_socia_mailchimp__withAddress(self, mock_mailchimp_client, mock_
         partner_id = self.Soci.read(self.cursor, self.uid, soci_id, ['partner_id'])['partner_id'][0]
         address_list = self.ResPartner.read(self.cursor, self.uid, partner_id, ['address'])['address']
 
+        mock_get_list_id.return_value = 'id'
+        mock_mailchimp_client.return_value = 'MAILCHIMP_CLIENT'
+
         self.Soci.arxiva_socia_mailchimp(self.cursor, self.uid, soci_id)
 
-        mock_get_list_id.return_value.get_mailchimp_list_id.return_value = 'id'
-        mock_mailchimp_client.return_value = 'MAILCHIMP_CLIENT'
-        mock_archieve.assert_called_with(self.cursor, self.uid, address_list, mock.ANY, mock.ANY)
+        mock_archieve.assert_called_with(self.cursor, self.uid, address_list, 'id', 'MAILCHIMP_CLIENT')
 
     @mock.patch("som_polissa_soci.res_partner_address.ResPartnerAddress.archieve_mail_in_list")
     @mock.patch("som_polissa_soci.res_partner_address.ResPartnerAddress.get_mailchimp_list_id")
@@ -140,12 +141,14 @@ def test__arxiva_socia_mailchimp__withManyAddress(self, mock_mailchimp_client, m
         address_list = self.ResPartner.read(self.cursor, self.uid, partner_id, ['address'])['address']
         other_address_id = self.ResPartnerAddress.search(self.cursor, self.uid, [('partner_id', '!=', partner_id)])[0]
         self.ResPartnerAddress.write(self.cursor, self.uid, other_address_id, {'partner_id': partner_id, 'email':'other@mail.com'})
-        self.Soci.arxiva_socia_mailchimp(self.cursor, self.uid, soci_id)
 
-        mock_get_list_id.return_value.get_mailchimp_list_id.return_value = 'id'
+        mock_get_list_id.return_value = 'id'
         mock_mailchimp_client.return_value = 'MAILCHIMP_CLIENT'
+
+        self.Soci.arxiva_socia_mailchimp(self.cursor, self.uid, soci_id)
+
         address_list.append(other_address_id)
-        mock_archieve.assert_called_with(self.cursor, self.uid, sorted(address_list), mock.ANY, mock.ANY)
+        mock_archieve.assert_called_with(self.cursor, self.uid, sorted(address_list), 'id', 'MAILCHIMP_CLIENT')
 
     @mock.patch("som_polissa_soci.res_partner_address.ResPartnerAddress.archieve_mail_in_list")
     @mock.patch("som_polissa_soci.res_partner_address.ResPartnerAddress.get_mailchimp_list_id")
@@ -157,10 +160,10 @@ def test__arxiva_socia_mailchimp__withoutMail(self, mock_mailchimp_client, mock_
             )[1]
         partner_id = self.Soci.read(self.cursor, self.uid, soci_id, ['partner_id'])['partner_id'][0]
         address_list = self.ResPartner.read(self.cursor, self.uid, partner_id, ['address'])['address']
+        mock_get_list_id.return_value = 'id'
+        mock_mailchimp_client.return_value = 'MAILCHIMP_CLIENT'
 
         self.Soci.arxiva_socia_mailchimp(self.cursor, self.uid, soci_id)
 
-        mock_get_list_id.return_value.get_mailchimp_list_id.return_value = 'id'
-        mock_mailchimp_client.return_value = 'MAILCHIMP_CLIENT'
-        mock_archieve.assert_called_with(self.cursor, self.uid, address_list, mock.ANY, mock.ANY)
+        mock_archieve.assert_called_with(self.cursor, self.uid, address_list,  'id', 'MAILCHIMP_CLIENT')