Skip to content

Commit

Permalink
Adapt test to use JSON headers
Browse files Browse the repository at this point in the history
Required by FastAPI, see comment galaxyproject#12152 (comment)
  • Loading branch information
davelopez committed Sep 1, 2021
1 parent 5d45848 commit 8645f82
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions lib/galaxy_test/api/test_histories.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import time

from requests import (
post,
put
)

Expand All @@ -26,7 +25,7 @@ def _update(self, history_id, data):

def _create_history(self, name):
post_data = dict(name=name)
create_response = self._post("histories", data=post_data).json()
create_response = self._post("histories", data=post_data, json=True).json()
self._assert_has_keys(create_response, "name", "id")
self.assertEqual(create_response["name"], name)
return create_response
Expand Down Expand Up @@ -109,7 +108,7 @@ def test_delete(self):
def test_purge(self):
history_id = self._create_history("TestHistoryForPurge")["id"]
data = {'purge': True}
self._delete(f"histories/{history_id}", data=data)
self._delete(f"histories/{history_id}", data=data, json=True)
show_response = self._show(history_id)
assert show_response["deleted"]
assert show_response["purged"]
Expand Down Expand Up @@ -192,23 +191,21 @@ def test_invalid_keys(self):

def test_create_anonymous_fails(self):
post_data = dict(name="CannotCreate")
# Using lower-level _api_url will cause key to not be injected.
histories_url = self._api_url("histories")
create_response = post(url=histories_url, data=post_data)
create_response = self._post("histories", data=post_data, anon=True, json=True)
self._assert_status_code_is(create_response, 403)

def test_create_without_session_fails(self):
post_data = dict(name="SessionNeeded")
# Using admin=True will boostrap an Admin user without session
create_response = self._post("histories", data=post_data, admin=True)
create_response = self._post("histories", data=post_data, admin=True, json=True)
self._assert_status_code_is(create_response, 400)

def test_create_tag(self):
post_data = dict(name="TestHistoryForTag")
history_id = self._post("histories", data=post_data).json()["id"]
history_id = self._post("histories", data=post_data, json=True).json()["id"]
tag_data = dict(value="awesometagvalue")
tag_url = f"histories/{history_id}/tags/awesometagname"
tag_create_response = self._post(tag_url, data=tag_data)
tag_create_response = self._post(tag_url, data=tag_data, json=True)
self._assert_status_code_is(tag_create_response, 200)

# TODO: (CE) test_create_from_copy
Expand Down

0 comments on commit 8645f82

Please sign in to comment.