Elevate test factory up one directory

tests/command_logic/test_logic_gameplay.py

@@ -0,0 +1,17 @@
+import pytest
+from sqlmodel import Session
+
+from command_logic.logic_gameplay import advance_runners
+from tests.factory import session_fixture, Game
+
+
+def test_advance_runners(session: Session):
+    this_game = session.get(Game, 3)
+    play_1 = this_game.initialize_play(session)
+
+    assert play_1.starting_outs == 0
+    assert play_1.on_first_id is None
+    assert play_1.on_second_id is None
+    assert play_1.on_third_id is None
+
+    # TODO: Test advance runners once "advance play" function is ready

tests/gameplay_models/test_card_model.py

@@ -3,7 +3,7 @@ from sqlmodel import Session
 
 from in_game.gameplay_models import CACHE_LIMIT, Card, Player, Team, select
 from in_game.gameplay_queries import get_or_create_ai_card, get_card_or_none
-from factory import session_fixture
+from tests.factory import session_fixture
 
 
 def test_create_card(session: Session):

tests/gameplay_models/test_cardset_model.py

@@ -4,7 +4,7 @@ from sqlmodel import Session
 
 from in_game.gameplay_models import select, Cardset, GameCardsetLink
 from in_game.gameplay_queries import get_channel_game_or_none, get_active_games_by_team
-from factory import session_fixture
+from tests.factory import session_fixture
 
 
 def test_create_cardset(session: Session):

tests/gameplay_models/test_game_model.py

@@ -5,7 +5,7 @@ from sqlmodel import Session, delete
 
 from in_game.gameplay_models import Game, Lineup, GameCardsetLink, Play, select
 from in_game.gameplay_queries import get_channel_game_or_none, get_active_games_by_team
-from factory import session_fixture
+from tests.factory import session_fixture
 
 
 def test_create_game(session: Session):

tests/gameplay_models/test_lineup_model.py

@@ -2,7 +2,7 @@ from sqlmodel import Session, select
 
 from in_game.gameplay_models import Game, Lineup
 from in_game.gameplay_queries import get_game_lineups
-from factory import session_fixture
+from tests.factory import session_fixture
 
 
 def test_create_lineup(session: Session):

tests/gameplay_models/test_managerai_model.py

@@ -1,7 +1,7 @@
 from sqlmodel import Session, select
 
 from in_game.gameplay_models import Game, Lineup, ManagerAi, Play
-from factory import session_fixture
+from tests.factory import session_fixture
 from in_game.managerai_responses import JumpResponse
 
 

tests/gameplay_models/test_play_model.py

@@ -1,7 +1,7 @@
 from sqlmodel import Session, select
 
 from in_game.gameplay_models import Lineup, Play, Game
-from factory import session_fixture
+from tests.factory import session_fixture
 
 
 def test_create_play(session: Session):

tests/gameplay_models/test_player_model.py

@@ -4,7 +4,7 @@ from sqlmodel import Session
 
 from in_game.gameplay_models import CACHE_LIMIT, Player, player_description, select
 from in_game.gameplay_queries import get_player_or_none, get_player_id_from_dict
-from factory import session_fixture
+from tests.factory import session_fixture
 
 
 def test_create_player(session: Session):
@@ -46,7 +46,7 @@ def test_player_description(session: Session):
 
     player_dict = {'player_id': player_2.id, 'p_name': player_2.name, 'description': player_2.description}
 
-    assert player_1.with_desc == f'2024 Player 0'
+    assert player_1.name_with_desc == f'2024 Player 0'
     assert player_description(player_dict=player_dict) == f'Live Player 1'
 
 

tests/gameplay_models/test_team_model.py

@@ -3,7 +3,7 @@ from sqlmodel import Session, select
 
 from in_game.gameplay_models import Team, CACHE_LIMIT
 from in_game.gameplay_queries import get_team_or_none
-from factory import session_fixture, pytest
+from tests.factory import session_fixture, pytest
 
 def test_create_team(session: Session):
     team_31 = session.get(Team, 31)