diff --git a/src/data_disclosure/tests/tests_data_disclosure.py b/src/data_disclosure/tests/tests_data_disclosure.py index 88d0addf8fcf5daf7e79a2bb339a59745f46be8a..d514510c21801af86b80c89c744d84e44daa52ac 100644 --- a/src/data_disclosure/tests/tests_data_disclosure.py +++ b/src/data_disclosure/tests/tests_data_disclosure.py @@ -15,7 +15,6 @@ from providers.models import ProviderAuthorization, Provider, ProviderVerbGroup, from users.models import CustomUser from data_disclosure.models import DataDisclosure -from data_disclosure.tasks import DataDisclosureProcessor @@ -38,10 +37,6 @@ class TestsDataDisclosure(BaseTestCase): }, ] - @patch.object(DataDisclosureProcessor, 'get_xapi_statements') - def mock_get_xapi_statements(self, user_email: str): - return [] - def setUp(self): call_command('check_and_apply_migrations') normal_user = CustomUser.objects.create_user( @@ -106,16 +101,19 @@ class TestsDataDisclosure(BaseTestCase): ) self.assertEqual(response.status_code, 200) - - def test_create_job(self): + @patch('celery.app.task.Task.apply_async') + def test_create_job(self, celery_mock): self.assertEqual(DataDisclosure.objects.count(), 0) response = self.user_client.post("/api/v1/data-disclosure/create") self.assertEqual(response.status_code, 200) self.assertEqual(DataDisclosure.objects.count(), 1) + self.assertTrue(celery_mock.called) + - def test_list_jobs(self): + @patch('celery.app.task.Task.apply_async') + def test_list_jobs(self, celery_mock): response = self.user_client.get("/api/v1/data-disclosure/list") self.assertEqual(response.status_code, 200) data = json.loads(response.content.decode()) @@ -123,13 +121,15 @@ class TestsDataDisclosure(BaseTestCase): response = self.user_client.post("/api/v1/data-disclosure/create") self.assertEqual(response.status_code, 200) + self.assertTrue(celery_mock.called) response = self.user_client.get("/api/v1/data-disclosure/list") self.assertEqual(response.status_code, 200) data = json.loads(response.content.decode()) self.assertEqual(len(data), 1) - def test_get_secret(self): + @patch('celery.app.task.Task.apply_async') + def test_get_secret(self, celery_mock): response = self.user_client.get("/api/v1/data-disclosure/list") self.assertEqual(response.status_code, 200) data = json.loads(response.content.decode()) @@ -137,6 +137,7 @@ class TestsDataDisclosure(BaseTestCase): response = self.user_client.post("/api/v1/data-disclosure/create") self.assertEqual(response.status_code, 200) + self.assertTrue(celery_mock.called) # create second job from another account response = self.provider_client.post("/api/v1/data-disclosure/create") @@ -162,8 +163,8 @@ class TestsDataDisclosure(BaseTestCase): response = self.user_client.get(f"/api/v1/data-disclosure/file_secret/{data[0]['id']}") # note the "user_client" self.assertEqual(response.status_code, 403) - - def test_get_file(self): + @patch('celery.app.task.Task.apply_async') + def test_get_file(self, celery_mock): response = self.user_client.get("/api/v1/data-disclosure/list") self.assertEqual(response.status_code, 200) data = json.loads(response.content.decode()) @@ -171,7 +172,7 @@ class TestsDataDisclosure(BaseTestCase): response = self.user_client.post("/api/v1/data-disclosure/create") self.assertEqual(response.status_code, 200) - + self.assertTrue(celery_mock.called) response = self.user_client.get("/api/v1/data-disclosure/list") self.assertEqual(response.status_code, 200) @@ -206,7 +207,8 @@ class TestsDataDisclosure(BaseTestCase): response = self.user_client.get(f"/api/v1/data-disclosure/files/{file_id}/{secret}") self.assertEqual(response.status_code, 200) - def test_delete_file(self): + @patch('celery.app.task.Task.apply_async') + def test_delete_file(self, celery_mock): response = self.user_client.get("/api/v1/data-disclosure/list") self.assertEqual(response.status_code, 200) data = json.loads(response.content.decode()) @@ -214,7 +216,7 @@ class TestsDataDisclosure(BaseTestCase): response = self.user_client.post("/api/v1/data-disclosure/create") self.assertEqual(response.status_code, 200) - + self.assertTrue(celery_mock.called) response = self.user_client.get("/api/v1/data-disclosure/list") self.assertEqual(response.status_code, 200)