From 4200d1dfaae57e13e304a28b87bcbe8eeaf77301 Mon Sep 17 00:00:00 2001 From: Kelvin Muchiri Date: Tue, 1 Oct 2024 14:04:27 +0300 Subject: [PATCH] fix failing tests --- .../tests/viewsets/test_dataview_viewset.py | 8 +-- .../api/tests/viewsets/test_legacy_exports.py | 70 +++++++++---------- .../tests/viewsets/test_metadata_viewset.py | 6 +- 3 files changed, 39 insertions(+), 45 deletions(-) diff --git a/onadata/apps/api/tests/viewsets/test_dataview_viewset.py b/onadata/apps/api/tests/viewsets/test_dataview_viewset.py index a2c42fef8f..9bb5835186 100644 --- a/onadata/apps/api/tests/viewsets/test_dataview_viewset.py +++ b/onadata/apps/api/tests/viewsets/test_dataview_viewset.py @@ -756,7 +756,7 @@ def test_csv_export_dataview(self): content_disposition = headers["Content-Disposition"] filename = filename_from_disposition(content_disposition) _basename, ext = os.path.splitext(filename) - self.assertEqual(ext, ".csv") + self.assertEqual(ext, '.csv"') content = get_response_content(response) test_file_path = os.path.join( @@ -838,7 +838,7 @@ def test_zip_export_dataview(self): content_disposition = headers["Content-Disposition"] filename = filename_from_disposition(content_disposition) _basename, ext = os.path.splitext(filename) - self.assertEqual(ext, ".zip") + self.assertEqual(ext, '.zip"') # pylint: disable=invalid-name @override_settings(CELERY_TASK_ALWAYS_EAGER=True) @@ -1574,7 +1574,7 @@ def test_export_dataview_not_affected_by_normal_exports(self): content_disposition = headers["Content-Disposition"] filename = filename_from_disposition(content_disposition) _basename, ext = os.path.splitext(filename) - self.assertEqual(ext, ".csv") + self.assertEqual(ext, '.csv"') content = get_response_content(response) @@ -1957,7 +1957,7 @@ def test_csv_export_dataview_date_filter(self): content_disposition = headers["Content-Disposition"] filename = filename_from_disposition(content_disposition) _basename, ext = os.path.splitext(filename) - self.assertEqual(ext, ".csv") + self.assertEqual(ext, '.csv"') content = get_response_content(response) self.assertEqual(content, "name,age,gender\nDennis Wambua,28,male\n") diff --git a/onadata/apps/api/tests/viewsets/test_legacy_exports.py b/onadata/apps/api/tests/viewsets/test_legacy_exports.py index a1fd20fd82..011a998a8e 100644 --- a/onadata/apps/api/tests/viewsets/test_legacy_exports.py +++ b/onadata/apps/api/tests/viewsets/test_legacy_exports.py @@ -14,81 +14,75 @@ def setUp(self): self._create_user_and_login() self._publish_transportation_form() self.factory = RequestFactory() - self.extra = { - 'HTTP_AUTHORIZATION': 'Token %s' % self.user.auth_token} + self.extra = {"HTTP_AUTHORIZATION": "Token %s" % self.user.auth_token} def _filename_from_disposition(self, content_disposition): - filename_pos = content_disposition.index('filename=') + filename_pos = content_disposition.index("filename=") self.assertTrue(filename_pos != -1) - return content_disposition[filename_pos + len('filename='):] + return content_disposition[filename_pos + len("filename=") :] def test_form_data_export(self): self._make_submissions() - view = XFormViewSet.as_view({ - 'get': 'retrieve' - }) + view = XFormViewSet.as_view({"get": "retrieve"}) formid = self.xform.pk # csv - request = self.factory.get('/', **self.extra) - response = view(request, pk=formid, format='csv') + request = self.factory.get("/", **self.extra) + response = view(request, pk=formid, format="csv") self.assertEqual(response.status_code, 200) headers = dict(response.items()) - content_disposition = headers['Content-Disposition'] + content_disposition = headers["Content-Disposition"] filename = self._filename_from_disposition(content_disposition) basename, ext = os.path.splitext(filename) - self.assertEqual(headers['Content-Type'], 'application/csv') - self.assertEqual(ext, '.csv') + self.assertEqual(headers["Content-Type"], "application/csv") + self.assertEqual(ext, '.csv"') # xls - request = self.factory.get('/', **self.extra) - response = view(request, pk=formid, format='xlsx') + request = self.factory.get("/", **self.extra) + response = view(request, pk=formid, format="xlsx") self.assertEqual(response.status_code, 200) headers = dict(response.items()) - content_disposition = headers['Content-Disposition'] + content_disposition = headers["Content-Disposition"] filename = self._filename_from_disposition(content_disposition) basename, ext = os.path.splitext(filename) - self.assertEqual(headers['Content-Type'], - 'application/vnd.openxmlformats') - self.assertEqual(ext, '.xlsx') + self.assertEqual(headers["Content-Type"], "application/vnd.openxmlformats") + self.assertEqual(ext, '.xlsx"') def test_data_export(self): self._make_submissions() - view = DataViewSet.as_view({ - 'get': 'list' - }) + view = DataViewSet.as_view({"get": "list"}) formid = self.xform.pk # csv - request = self.factory.get('/', **self.extra) - response = view(request, pk=formid, format='csv') + request = self.factory.get("/", **self.extra) + response = view(request, pk=formid, format="csv") self.assertEqual(response.status_code, 200) headers = dict(response.items()) - content_disposition = headers['Content-Disposition'] + content_disposition = headers["Content-Disposition"] filename = self._filename_from_disposition(content_disposition) basename, ext = os.path.splitext(filename) - self.assertEqual(headers['Content-Type'], 'application/csv') - self.assertEqual(ext, '.csv') + self.assertEqual(headers["Content-Type"], "application/csv") + self.assertEqual(ext, '.csv"') # xls - request = self.factory.get('/', **self.extra) - response = view(request, pk=formid, format='xlsx') + request = self.factory.get("/", **self.extra) + response = view(request, pk=formid, format="xlsx") self.assertEqual(response.status_code, 200) headers = dict(response.items()) - content_disposition = headers['Content-Disposition'] + content_disposition = headers["Content-Disposition"] filename = self._filename_from_disposition(content_disposition) basename, ext = os.path.splitext(filename) - self.assertEqual(headers['Content-Type'], - 'application/vnd.openxmlformats') - self.assertEqual(ext, '.xlsx') + self.assertEqual(headers["Content-Type"], "application/vnd.openxmlformats") + self.assertEqual(ext, '.xlsx"') # kml - request = self.factory.get('/', **self.extra) - response = view(request, pk=formid, format='kml') + request = self.factory.get("/", **self.extra) + response = view(request, pk=formid, format="kml") self.assertEqual(response.status_code, 200) headers = dict(response.items()) - content_disposition = headers['Content-Disposition'] + content_disposition = headers["Content-Disposition"] filename = self._filename_from_disposition(content_disposition) basename, ext = os.path.splitext(filename) - self.assertEqual(headers['Content-Type'], - 'application/vnd.google-earth.kml+xml') - self.assertEqual(ext, '.kml') + self.assertEqual( + headers["Content-Type"], "application/vnd.google-earth.kml+xml" + ) + self.assertEqual(ext, '.kml"') diff --git a/onadata/apps/api/tests/viewsets/test_metadata_viewset.py b/onadata/apps/api/tests/viewsets/test_metadata_viewset.py index d81c8b5c5a..2640f6fd5c 100644 --- a/onadata/apps/api/tests/viewsets/test_metadata_viewset.py +++ b/onadata/apps/api/tests/viewsets/test_metadata_viewset.py @@ -307,7 +307,7 @@ def test_add_media_xform_link(self): response = self.view(request, pk=self.metadata.pk, format=ext) self.assertEqual(response.status_code, 200) self.assertEqual( - response["Content-Disposition"], "attachment; filename=transportation.csv" + response["Content-Disposition"], 'attachment; filename="transportation.csv"' ) def test_add_media_geojson_link(self): @@ -329,7 +329,7 @@ def test_add_media_geojson_link(self): self.assertEqual(response.status_code, 200) self.assertEqual( response["Content-Disposition"], - "attachment; filename=transportation.geojson", + 'attachment; filename="transportation.geojson"', ) def test_add_media_dataview_link(self): @@ -344,7 +344,7 @@ def test_add_media_dataview_link(self): response = self.view(request, pk=self.metadata.pk, format=ext) self.assertEqual(response.status_code, 200) self.assertEqual( - response["Content-Disposition"], "attachment; filename=transportation.csv" + response["Content-Disposition"], 'attachment; filename="transportation.csv"' ) def test_invalid_post(self):