Skip to content

dictionary from encounters subresource (#332) #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

dictionary from encounters subresource (#332) #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21650a4
dictionary from encounters subresource (#332)
jrubinator Apr 21, 2018
f882b5a
Make lint happy
jrubinator Apr 24, 2018
a3407f5
Merge branch 'master' into encounter-dict
tdmalone Sep 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pokemon_v2/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,4 +487,4 @@ def get(self, request, pokemon_id):
'version_details': version_details_list
})

return Response(encounters_list)
return Response({'results': encounters_list})
8 changes: 8 additions & 0 deletions pokemon_v2/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4250,6 +4250,14 @@ def test_pokemon_api(self):
self.assertEqual(
response.data['forms'][0]['url'],
'{}{}/pokemon-form/{}/'.format(test_host, api_v2, pokemon_form.pk))
# encounters parameters
self.assertEqual(
response.data['location_area_encounters'],
'{}/pokemon/{}/encounters'.format(api_v2, response.data['id']))
# Can't do this because sqlite doesn't support distinct()
# which is used by the API call
# encounters_response= self.client.get(
# '{}/pokemon/{}/encounters'.format(api_v2, pokemon.pk), HTTP_HOST='testserver')
# sprite params
self.assertEqual(
response.data['sprites']['front_default'],
Expand Down