Skip to content

Commit

Permalink
fix failing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@kelvin-muchiri
kelvin-muchiri committed Oct 3, 2024
1 parent c6a26b2 commit 4200d1d
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 45 deletions.
8 changes: 4 additions & 4 deletions onadata/apps/api/tests/viewsets/test_dataview_viewset.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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")
Expand Down
70 changes: 32 additions & 38 deletions onadata/apps/api/tests/viewsets/test_legacy_exports.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"')
6 changes: 3 additions & 3 deletions onadata/apps/api/tests/viewsets/test_metadata_viewset.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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):
Expand All @@ -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):
Expand Down

0 comments on commit 4200d1d

Please sign in to comment.