test(lua.endpoints): make use of assert_gamestate_response in tests

Author: S1M0N38

tests/lua/endpoints/test_add.py

@@ -4,7 +4,12 @@
 
 import pytest
 
-from tests.lua.conftest import api, assert_error_response, load_fixture
+from tests.lua.conftest import (
+    api,
+    assert_error_response,
+    assert_gamestate_response,
+    load_fixture,
+)
 
 
 class TestAddEndpoint:
@@ -20,8 +25,9 @@ def test_add_joker(self, client: socket.socket) -> None:
         assert gamestate["state"] == "SELECTING_HAND"
         assert gamestate["jokers"]["count"] == 0
         response = api(client, "add", {"key": "j_joker"})
-        assert response["result"]["jokers"]["count"] == 1
-        assert response["result"]["jokers"]["cards"][0]["key"] == "j_joker"
+        after = assert_gamestate_response(response)
+        assert after["jokers"]["count"] == 1
+        assert after["jokers"]["cards"][0]["key"] == "j_joker"
 
     def test_add_consumable_tarot(self, client: socket.socket) -> None:
         """Test adding a tarot consumable with valid key."""
@@ -33,8 +39,9 @@ def test_add_consumable_tarot(self, client: socket.socket) -> None:
         assert gamestate["state"] == "SELECTING_HAND"
         assert gamestate["consumables"]["count"] == 0
         response = api(client, "add", {"key": "c_fool"})
-        assert response["result"]["consumables"]["count"] == 1
-        assert response["result"]["consumables"]["cards"][0]["key"] == "c_fool"
+        after = assert_gamestate_response(response)
+        assert after["consumables"]["count"] == 1
+        assert after["consumables"]["cards"][0]["key"] == "c_fool"
 
     def test_add_consumable_planet(self, client: socket.socket) -> None:
         """Test adding a planet consumable with valid key."""
@@ -46,8 +53,9 @@ def test_add_consumable_planet(self, client: socket.socket) -> None:
         assert gamestate["state"] == "SELECTING_HAND"
         assert gamestate["consumables"]["count"] == 0
         response = api(client, "add", {"key": "c_mercury"})
-        assert response["result"]["consumables"]["count"] == 1
-        assert response["result"]["consumables"]["cards"][0]["key"] == "c_mercury"
+        after = assert_gamestate_response(response)
+        assert after["consumables"]["count"] == 1
+        assert after["consumables"]["cards"][0]["key"] == "c_mercury"
 
     def test_add_consumable_spectral(self, client: socket.socket) -> None:
         """Test adding a spectral consumable with valid key."""
@@ -59,8 +67,9 @@ def test_add_consumable_spectral(self, client: socket.socket) -> None:
         assert gamestate["state"] == "SELECTING_HAND"
         assert gamestate["consumables"]["count"] == 0
         response = api(client, "add", {"key": "c_familiar"})
-        assert response["result"]["consumables"]["count"] == 1
-        assert response["result"]["consumables"]["cards"][0]["key"] == "c_familiar"
+        after = assert_gamestate_response(response)
+        assert after["consumables"]["count"] == 1
+        assert after["consumables"]["cards"][0]["key"] == "c_familiar"
 
     def test_add_voucher(self, client: socket.socket) -> None:
         """Test adding a voucher with valid key in SHOP state."""
@@ -72,8 +81,9 @@ def test_add_voucher(self, client: socket.socket) -> None:
         assert gamestate["state"] == "SHOP"
         assert gamestate["vouchers"]["count"] == 0
         response = api(client, "add", {"key": "v_overstock_norm"})
-        assert response["result"]["vouchers"]["count"] == 1
-        assert response["result"]["vouchers"]["cards"][0]["key"] == "v_overstock_norm"
+        after = assert_gamestate_response(response)
+        assert after["vouchers"]["count"] == 1
+        assert after["vouchers"]["cards"][0]["key"] == "v_overstock_norm"
 
     def test_add_playing_card(self, client: socket.socket) -> None:
         """Test adding a playing card with valid key."""
@@ -85,8 +95,9 @@ def test_add_playing_card(self, client: socket.socket) -> None:
         assert gamestate["state"] == "SELECTING_HAND"
         assert gamestate["hand"]["count"] == 8
         response = api(client, "add", {"key": "H_A"})
-        assert response["result"]["hand"]["count"] == 9
-        assert response["result"]["hand"]["cards"][8]["key"] == "H_A"
+        after = assert_gamestate_response(response)
+        assert after["hand"]["count"] == 9
+        assert after["hand"]["cards"][8]["key"] == "H_A"
 
     def test_add_no_key_provided(self, client: socket.socket) -> None:
         """Test add endpoint with no key parameter."""
@@ -205,9 +216,10 @@ def test_add_playing_card_with_seal(self, client: socket.socket, seal: str) -> N
         assert gamestate["state"] == "SELECTING_HAND"
         assert gamestate["hand"]["count"] == 8
         response = api(client, "add", {"key": "H_A", "seal": seal})
-        assert response["result"]["hand"]["count"] == 9
-        assert response["result"]["hand"]["cards"][8]["key"] == "H_A"
-        assert response["result"]["hand"]["cards"][8]["modifier"]["seal"] == seal
+        after = assert_gamestate_response(response)
+        assert after["hand"]["count"] == 9
+        assert after["hand"]["cards"][8]["key"] == "H_A"
+        assert after["hand"]["cards"][8]["modifier"]["seal"] == seal
 
     def test_add_playing_card_invalid_seal(self, client: socket.socket) -> None:
         """Test adding a playing card with invalid seal value."""
@@ -258,11 +270,10 @@ def test_add_joker_with_edition(self, client: socket.socket, edition: str) -> No
         assert gamestate["state"] == "SHOP"
         assert gamestate["jokers"]["count"] == 0
         response = api(client, "add", {"key": "j_joker", "edition": edition})
-        assert response["result"]["jokers"]["count"] == 1
-        assert response["result"]["jokers"]["cards"][0]["key"] == "j_joker"
-        assert (
-            response["result"]["jokers"]["cards"][0]["modifier"]["edition"] == edition
-        )
+        after = assert_gamestate_response(response)
+        assert after["jokers"]["count"] == 1
+        assert after["jokers"]["cards"][0]["key"] == "j_joker"
+        assert after["jokers"]["cards"][0]["modifier"]["edition"] == edition
 
     @pytest.mark.parametrize("edition", ["HOLO", "FOIL", "POLYCHROME", "NEGATIVE"])
     def test_add_playing_card_with_edition(
@@ -277,9 +288,10 @@ def test_add_playing_card_with_edition(
         assert gamestate["state"] == "SELECTING_HAND"
         assert gamestate["hand"]["count"] == 8
         response = api(client, "add", {"key": "H_A", "edition": edition})
-        assert response["result"]["hand"]["count"] == 9
-        assert response["result"]["hand"]["cards"][8]["key"] == "H_A"
-        assert response["result"]["hand"]["cards"][8]["modifier"]["edition"] == edition
+        after = assert_gamestate_response(response)
+        assert after["hand"]["count"] == 9
+        assert after["hand"]["cards"][8]["key"] == "H_A"
+        assert after["hand"]["cards"][8]["modifier"]["edition"] == edition
 
     def test_add_consumable_with_negative_edition(self, client: socket.socket) -> None:
         """Test adding a consumable with NEGATIVE edition (only valid edition for consumables)."""
@@ -291,12 +303,10 @@ def test_add_consumable_with_negative_edition(self, client: socket.socket) -> No
         assert gamestate["state"] == "SHOP"
         assert gamestate["consumables"]["count"] == 0
         response = api(client, "add", {"key": "c_fool", "edition": "NEGATIVE"})
-        assert response["result"]["consumables"]["count"] == 1
-        assert response["result"]["consumables"]["cards"][0]["key"] == "c_fool"
-        assert (
-            response["result"]["consumables"]["cards"][0]["modifier"]["edition"]
-            == "NEGATIVE"
-        )
+        after = assert_gamestate_response(response)
+        assert after["consumables"]["count"] == 1
+        assert after["consumables"]["cards"][0]["key"] == "c_fool"
+        assert after["consumables"]["cards"][0]["modifier"]["edition"] == "NEGATIVE"
 
     @pytest.mark.parametrize("edition", ["HOLO", "FOIL", "POLYCHROME"])
     def test_add_consumable_with_non_negative_edition_fails(
@@ -367,12 +377,10 @@ def test_add_playing_card_with_enhancement(
         assert gamestate["state"] == "SELECTING_HAND"
         assert gamestate["hand"]["count"] == 8
         response = api(client, "add", {"key": "H_A", "enhancement": enhancement})
-        assert response["result"]["hand"]["count"] == 9
-        assert response["result"]["hand"]["cards"][8]["key"] == "H_A"
-        assert (
-            response["result"]["hand"]["cards"][8]["modifier"]["enhancement"]
-            == enhancement
-        )
+        after = assert_gamestate_response(response)
+        assert after["hand"]["count"] == 9
+        assert after["hand"]["cards"][8]["key"] == "H_A"
+        assert after["hand"]["cards"][8]["modifier"]["enhancement"] == enhancement
 
     def test_add_playing_card_invalid_enhancement(self, client: socket.socket) -> None:
         """Test adding a playing card with invalid enhancement value."""
@@ -423,9 +431,10 @@ def test_add_joker_with_eternal(self, client: socket.socket) -> None:
         assert gamestate["state"] == "SHOP"
         assert gamestate["jokers"]["count"] == 0
         response = api(client, "add", {"key": "j_joker", "eternal": True})
-        assert response["result"]["jokers"]["count"] == 1
-        assert response["result"]["jokers"]["cards"][0]["key"] == "j_joker"
-        assert response["result"]["jokers"]["cards"][0]["modifier"]["eternal"] is True
+        after = assert_gamestate_response(response)
+        assert after["jokers"]["count"] == 1
+        assert after["jokers"]["cards"][0]["key"] == "j_joker"
+        assert after["jokers"]["cards"][0]["modifier"]["eternal"] is True
 
     @pytest.mark.parametrize("key", ["c_fool", "v_overstock_norm"])
     def test_add_non_joker_with_eternal_fails(
@@ -473,11 +482,10 @@ def test_add_joker_with_perishable(
         assert gamestate["state"] == "SHOP"
         assert gamestate["jokers"]["count"] == 0
         response = api(client, "add", {"key": "j_joker", "perishable": rounds})
-        assert response["result"]["jokers"]["count"] == 1
-        assert response["result"]["jokers"]["cards"][0]["key"] == "j_joker"
-        assert (
-            response["result"]["jokers"]["cards"][0]["modifier"]["perishable"] == rounds
-        )
+        after = assert_gamestate_response(response)
+        assert after["jokers"]["count"] == 1
+        assert after["jokers"]["cards"][0]["key"] == "j_joker"
+        assert after["jokers"]["cards"][0]["modifier"]["perishable"] == rounds
 
     def test_add_joker_with_eternal_and_perishable(self, client: socket.socket) -> None:
         """Test adding a joker with both eternal and perishable stickers."""
@@ -491,10 +499,11 @@ def test_add_joker_with_eternal_and_perishable(self, client: socket.socket) -> N
         response = api(
             client, "add", {"key": "j_joker", "eternal": True, "perishable": 5}
         )
-        assert response["result"]["jokers"]["count"] == 1
-        assert response["result"]["jokers"]["cards"][0]["key"] == "j_joker"
-        assert response["result"]["jokers"]["cards"][0]["modifier"]["eternal"] is True
-        assert response["result"]["jokers"]["cards"][0]["modifier"]["perishable"] == 5
+        after = assert_gamestate_response(response)
+        assert after["jokers"]["count"] == 1
+        assert after["jokers"]["cards"][0]["key"] == "j_joker"
+        assert after["jokers"]["cards"][0]["modifier"]["eternal"] is True
+        assert after["jokers"]["cards"][0]["modifier"]["perishable"] == 5
 
     @pytest.mark.parametrize("invalid_value", [0, -1])
     def test_add_joker_with_perishable_invalid_integer_fails(
@@ -580,9 +589,10 @@ def test_add_joker_with_rental(self, client: socket.socket) -> None:
         assert gamestate["state"] == "SHOP"
         assert gamestate["jokers"]["count"] == 0
         response = api(client, "add", {"key": "j_joker", "rental": True})
-        assert response["result"]["jokers"]["count"] == 1
-        assert response["result"]["jokers"]["cards"][0]["key"] == "j_joker"
-        assert response["result"]["jokers"]["cards"][0]["modifier"]["rental"] is True
+        after = assert_gamestate_response(response)
+        assert after["jokers"]["count"] == 1
+        assert after["jokers"]["cards"][0]["key"] == "j_joker"
+        assert after["jokers"]["cards"][0]["modifier"]["rental"] is True
 
     @pytest.mark.parametrize("key", ["c_fool", "v_overstock_norm"])
     def test_add_non_joker_with_rental_fails(
@@ -614,10 +624,11 @@ def test_add_joker_with_rental_and_eternal(self, client: socket.socket) -> None:
         response = api(
             client, "add", {"key": "j_joker", "rental": True, "eternal": True}
         )
-        assert response["result"]["jokers"]["count"] == 1
-        assert response["result"]["jokers"]["cards"][0]["key"] == "j_joker"
-        assert response["result"]["jokers"]["cards"][0]["modifier"]["rental"] is True
-        assert response["result"]["jokers"]["cards"][0]["modifier"]["eternal"] is True
+        after = assert_gamestate_response(response)
+        assert after["jokers"]["count"] == 1
+        assert after["jokers"]["cards"][0]["key"] == "j_joker"
+        assert after["jokers"]["cards"][0]["modifier"]["rental"] is True
+        assert after["jokers"]["cards"][0]["modifier"]["eternal"] is True
 
     def test_add_playing_card_with_rental_fails(self, client: socket.socket) -> None:
         """Test that rental cannot be applied to playing cards."""

tests/lua/endpoints/test_buy.py

@@ -4,7 +4,12 @@
 
 import pytest
 
-from tests.lua.conftest import api, assert_error_response, load_fixture
+from tests.lua.conftest import (
+    api,
+    assert_error_response,
+    assert_gamestate_response,
+    load_fixture,
+)
 
 
 class TestBuyEndpoint:
@@ -128,15 +133,17 @@ def test_buy_joker_success(self, client: socket.socket) -> None:
         assert gamestate["state"] == "SHOP"
         assert gamestate["shop"]["cards"][0]["set"] == "JOKER"
         response = api(client, "buy", {"card": 0})
-        assert response["result"]["jokers"]["cards"][0]["set"] == "JOKER"
+        gamestate = assert_gamestate_response(response)
+        assert gamestate["jokers"]["cards"][0]["set"] == "JOKER"
 
     def test_buy_consumable_success(self, client: socket.socket) -> None:
         """Test buying a consumable card (Planet/Tarot/Spectral) from shop."""
         gamestate = load_fixture(client, "buy", "state-SHOP--shop.cards[1].set-PLANET")
         assert gamestate["state"] == "SHOP"
         assert gamestate["shop"]["cards"][1]["set"] == "PLANET"
         response = api(client, "buy", {"card": 1})
-        assert response["result"]["consumables"]["cards"][0]["set"] == "PLANET"
+        gamestate = assert_gamestate_response(response)
+        assert gamestate["consumables"]["cards"][0]["set"] == "PLANET"
 
     def test_buy_voucher_success(self, client: socket.socket) -> None:
         """Test buying a voucher from shop."""
@@ -146,8 +153,9 @@ def test_buy_voucher_success(self, client: socket.socket) -> None:
         assert gamestate["state"] == "SHOP"
         assert gamestate["vouchers"]["cards"][0]["set"] == "VOUCHER"
         response = api(client, "buy", {"voucher": 0})
-        assert response["result"]["used_vouchers"] is not None
-        assert len(response["result"]["used_vouchers"]) > 0
+        gamestate = assert_gamestate_response(response)
+        assert gamestate["used_vouchers"] is not None
+        assert len(gamestate["used_vouchers"]) > 0
 
     def test_buy_packs_success(self, client: socket.socket) -> None:
         """Test buying a pack from shop."""
@@ -160,8 +168,9 @@ def test_buy_packs_success(self, client: socket.socket) -> None:
         assert gamestate["packs"]["cards"][0]["label"] == "Buffoon Pack"
         assert gamestate["packs"]["cards"][1]["label"] == "Standard Pack"
         response = api(client, "buy", {"pack": 0})
-        assert response["result"]["pack"] is not None
-        assert len(response["result"]["pack"]["cards"]) > 0
+        gamestate = assert_gamestate_response(response)
+        assert gamestate["pack"] is not None
+        assert len(gamestate["pack"]["cards"]) > 0
 
 
 class TestBuyEndpointValidation:

tests/lua/endpoints/test_cash_out.py

@@ -1,21 +1,13 @@
 """Tests for src/lua/endpoints/cash_out.lua"""
 
 import socket
-from typing import Any
 
-from tests.lua.conftest import api, assert_error_response, load_fixture
-
-
-def verify_cash_out_response(response: dict[str, Any]) -> None:
-    """Verify that cash_out response has expected fields."""
-    # Verify state field - should transition to SHOP after cashing out
-    assert "state" in response["result"]
-    assert isinstance(response["result"]["state"], str)
-    assert response["result"]["state"] == "SHOP"
-
-    # Verify shop field exists
-    assert "shop" in response["result"]
-    assert isinstance(response["result"]["shop"], dict)
+from tests.lua.conftest import (
+    api,
+    assert_error_response,
+    assert_gamestate_response,
+    load_fixture,
+)
 
 
 class TestCashOutEndpoint:
@@ -26,8 +18,7 @@ def test_cash_out_from_ROUND_EVAL(self, client: socket.socket) -> None:
         gamestate = load_fixture(client, "cash_out", "state-ROUND_EVAL")
         assert gamestate["state"] == "ROUND_EVAL"
         response = api(client, "cash_out", {})
-        verify_cash_out_response(response)
-        assert response["result"]["state"] == "SHOP"
+        assert_gamestate_response(response, state="SHOP")
 
 
 class TestCashOutEndpointStateRequirements:

tests/lua/endpoints/test_discard.py

@@ -2,7 +2,12 @@
 
 import socket
 
-from tests.lua.conftest import api, assert_error_response, load_fixture
+from tests.lua.conftest import (
+    api,
+    assert_error_response,
+    assert_gamestate_response,
+    load_fixture,
+)
 
 
 class TestDiscardEndpoint:
@@ -53,25 +58,19 @@ def test_discard_no_discards_left(self, client: socket.socket) -> None:
 
     def test_discard_valid_single_card(self, client: socket.socket) -> None:
         """Test discard endpoint with valid single card."""
-        gamestate = load_fixture(client, "discard", "state-SELECTING_HAND")
-        assert gamestate["state"] == "SELECTING_HAND"
+        before = load_fixture(client, "discard", "state-SELECTING_HAND")
+        assert before["state"] == "SELECTING_HAND"
         response = api(client, "discard", {"cards": [0]})
-        assert response["result"]["state"] == "SELECTING_HAND"
-        assert (
-            response["result"]["round"]["discards_left"]
-            == gamestate["round"]["discards_left"] - 1
-        )
+        after = assert_gamestate_response(response, state="SELECTING_HAND")
+        assert after["round"]["discards_left"] == before["round"]["discards_left"] - 1
 
     def test_discard_valid_multiple_cards(self, client: socket.socket) -> None:
         """Test discard endpoint with valid multiple cards."""
-        gamestate = load_fixture(client, "discard", "state-SELECTING_HAND")
-        assert gamestate["state"] == "SELECTING_HAND"
+        before = load_fixture(client, "discard", "state-SELECTING_HAND")
+        assert before["state"] == "SELECTING_HAND"
         response = api(client, "discard", {"cards": [1, 2, 3]})
-        assert response["result"]["state"] == "SELECTING_HAND"
-        assert (
-            response["result"]["round"]["discards_left"]
-            == gamestate["round"]["discards_left"] - 1
-        )
+        after = assert_gamestate_response(response, state="SELECTING_HAND")
+        assert after["round"]["discards_left"] == before["round"]["discards_left"] - 1
 
 
 class TestDiscardEndpointValidation: