diff --git a/main/tests.py b/main/tests.py index 6d72f2e..d7001af 100644 --- a/main/tests.py +++ b/main/tests.py @@ -115,7 +115,7 @@ class MakeEngineerTestCase(TestCase): self.admin_client.force_login(get_user_model().objects.get(email=self.admin)) @patch('main.extra_func.zenpy') - def test_redirect(self): + def test_redirect(self, zenpy_mock): """ Функция проверки переадресации пользователя на рабочую страницу после назначения роли engineer. """ @@ -123,6 +123,7 @@ class MakeEngineerTestCase(TestCase): resp = self.client.post(reverse_lazy('work_become_engineer')) self.assertRedirects(resp, reverse('work', args=[user.id])) self.assertEqual(resp.status_code, 302) + self.assertFalse(zenpy_mock.called) @patch('main.extra_func.zenpy') def test_light_agent_make_engineer(self, zenpy_mock): @@ -194,7 +195,7 @@ class PasswordResetTestCase(TestCase): self.user = '123@test.ru' self.email_backend = 'django.core.mail.backends.locmem.EmailBackend' self.client = Client() - self.client.force_login(User.objects.get(email=self.user)) + self.client.force_login(get_user_model().objects.get(email=self.user)) def test_redirect(self): with self.settings(EMAIL_BACKEND=self.email_backend): @@ -236,14 +237,14 @@ class PasswordChangeTestCase(TestCase): def setUp(self): self.user = '123@test.ru' self.client = Client() - self.client.force_login(User.objects.get(email=self.user)) + self.client.force_login(get_user_model().objects.get(email=self.user)) self.set_password() def set_password(self): - user: User = User.objects.get(email=self.user) + user: get_user_model() = get_user_model().objects.get(email=self.user) user.set_password('ImpossiblyHardPassword') user.save() - self.client.force_login(User.objects.get(email=self.user)) + self.client.force_login(get_user_model().objects.get(email=self.user)) def test_change_successful(self): self.client.post( @@ -254,7 +255,7 @@ class PasswordChangeTestCase(TestCase): 'new_password2': 'EasyPassword', } ) - user = User.objects.get(email=self.user) + user = get_user_model().objects.get(email=self.user) self.assertTrue(user.check_password('EasyPassword')) def test_invalid_old_password(self): @@ -331,9 +332,9 @@ class GetTicketsTestCase(TestCase): self.light_agent = '123@test.ru' self.engineer = 'customer@example.com' self.client = Client() - self.client.force_login(User.objects.get(email=self.engineer)) + self.client.force_login(get_user_model().objects.get(email=self.engineer)) self.light_agent_client = Client() - self.light_agent_client.force_login(User.objects.get(email=self.light_agent)) + self.light_agent_client.force_login(get_user_model().objects.get(email=self.light_agent)) @patch('main.views.zenpy.get_user') @patch('main.extra_func.zenpy') @@ -342,7 +343,7 @@ class GetTicketsTestCase(TestCase): Функция проверки переадресации пользователя на рабочую страницу. """ GetUserMock.return_value = Mock() - user = User.objects.get(email=self.engineer) + user = get_user_model().objects.get(email=self.engineer) resp = self.client.post(reverse('work_get_tickets')) self.assertRedirects(resp, reverse('work', args=[user.id])) self.assertEqual(resp.status_code, 302) @@ -421,9 +422,9 @@ class ProfileTestCase(TestCase): self.zendesk_agent_email = 'krav-88@mail.ru' self.zendesk_admin_email = 'idar.sokurov.05@mail.ru' self.client = Client() - self.client.force_login(User.objects.get(email=self.zendesk_agent_email)) + self.client.force_login(get_user_model().objects.get(email=self.zendesk_agent_email)) self.admin_client = Client() - self.admin_client.force_login(User.objects.get(email=self.zendesk_admin_email)) + self.admin_client.force_login(get_user_model().objects.get(email=self.zendesk_admin_email)) def test_correct_username(self): """