Skip to content
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

Duplicate of #959 #961

Merged
merged 17 commits into from
Dec 1, 2023
Merged

Duplicate of #959 #961

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
218864d
Make the type of the `sprites` column in pokemon_v2_pokemonsprites `j…
simonorono Nov 19, 2023
fa14336
Stop encoding sprites when inserting them on the database
simonorono Nov 19, 2023
6ff2c0c
Fix serialization of pokemon sprites
simonorono Nov 19, 2023
49d970f
Remove unused serializer class PokemonSpritesSerializer
simonorono Nov 19, 2023
30e8a01
Format migration 0014_auto_20231119_0303.py
simonorono Nov 19, 2023
8f716cd
Update Django to version 3.1
simonorono Nov 22, 2023
d1e2d9c
Use new JSON field in Django instead of Postgres custom one
simonorono Nov 23, 2023
db33cfc
Format missing files
simonorono Nov 23, 2023
45efd07
Remove root __init__.py file
simonorono Nov 25, 2023
d57fd5a
Add a Makefile rule for running the tests inside the docker container
simonorono Nov 25, 2023
0dcaf0d
Remove unused packages in requirements.txt
simonorono Nov 25, 2023
76f7a34
Use JSONField instead of CharField for sprites
simonorono Nov 26, 2023
61c2185
Fix serializers for ItemSprites and PokemonFormSprites
simonorono Nov 26, 2023
b3d6608
Fix tests for sprites
simonorono Nov 26, 2023
b348e60
refactor: merge migrations
Naramsim Nov 30, 2023
f7f2be7
cicd: try add build image action
Naramsim Nov 30, 2023
35f4712
cicd: run on PRs
Naramsim Nov 30, 2023
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
Prev Previous commit
Next Next commit
Fix tests for sprites 
Moved the declaration of sprite_data variables closer to their actual
usage.
  • Loading branch information
@simonorono
simonorono committed Nov 26, 2023
commit b3d6608283f035bca36b260224a780e0423f25ae
24 changes: 12 additions & 12 deletions pokemon_v2/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2588,8 +2588,6 @@ def test_item_api(self):
item_attribute_map = ItemAttributeMap(item=item, item_attribute=item_attribute)
item_attribute_map.save()

sprites_data = json.loads(item_sprites.sprites)

response = self.client.get(
"{}/item/{}/".format(API_V2, item.pk), HTTP_HOST="testserver"
)
Expand Down Expand Up @@ -2708,9 +2706,12 @@ def test_item_api(self):
response.data["baby_trigger_for"]["url"],
"{}{}/evolution-chain/{}/".format(TEST_HOST, API_V2, evolution_chain.pk),
)

sprites_data = json.loads(response.data["sprites"])

# sprites
self.assertEqual(
response.data["sprites"]["default"],
sprites_data["default"],
"{}".format(sprites_data["default"]),
)

Expand Down Expand Up @@ -4837,8 +4838,6 @@ def test_pokemon_api(self):
"{}/pokemon/{}/".format(API_V2, pokemon.pk), HTTP_HOST="testserver"
)

sprites_data = json.loads(pokemon_sprites.sprites)

self.assertEqual(response.status_code, status.HTTP_200_OK)

# base params
Expand Down Expand Up @@ -5025,14 +5024,14 @@ def test_pokemon_api(self):
"{}{}/pokemon-form/{}/".format(TEST_HOST, API_V2, pokemon_form.pk),
)

sprite_response = json.loads(response.data["sprites"])
sprites_data = json.loads(pokemon_sprites.sprites)

# sprite params
self.assertEqual(
sprite_response["front_default"],
sprites_data["front_default"],
"{}".format(sprites_data["front_default"]),
)
self.assertEqual(sprite_response["back_default"], None)
self.assertEqual(sprites_data["back_default"], None)

def test_pokemon_form_api(self):
pokemon_species = self.setup_pokemon_species_data()
Expand All @@ -5043,8 +5042,6 @@ def test_pokemon_form_api(self):
pokemon_form_sprites = self.setup_pokemon_form_sprites_data(pokemon_form)
pokemon_form_type = self.setup_pokemon_form_type_data(pokemon_form)

sprites_data = json.loads(pokemon_form_sprites.sprites)

response = self.client.get(
"{}/pokemon-form/{}/".format(API_V2, pokemon_form.pk),
HTTP_HOST="testserver",
Expand Down Expand Up @@ -5077,12 +5074,15 @@ def test_pokemon_form_api(self):
TEST_HOST, API_V2, pokemon_form.version_group.pk
),
)

sprites_data = json.loads(pokemon_form_sprites.sprites)

# sprite params
self.assertEqual(
response.data["sprites"]["front_default"],
sprites_data["front_default"],
"{}".format(sprites_data["front_default"]),
)
self.assertEqual(response.data["sprites"]["back_default"], None)
self.assertEqual(sprites_data["back_default"], None)
# type params
self.assertEqual(response.data["types"][0]["slot"], pokemon_form_type.slot)
self.assertEqual(
Expand Down