refactor: tidy up some view tests

danjac · Sep 12, 2024 · 2590d6a · 2590d6a
1 parent 1b518cb
commit 2590d6a
Showing 1 changed file with 23 additions and 12 deletions.
diff --git a/radiofeed/episodes/tests/test_views.py b/radiofeed/episodes/tests/test_views.py
@@ -25,14 +25,28 @@
 _index_url = reverse_lazy("episodes:index")
 
 
-@pytest.fixture
-def player_episode(auth_user, client, episode):
-    AudioLogFactory(user=auth_user, episode=episode)
+def assert_episode_in_player(client, episode_id):
+    assert (
+        client.session[PlayerDetails.session_key] == episode_id
+    ), f"Episode {episode_id} not in sesssion"
+
+
+def assert_episode_not_in_player(client, episode_id):
+    assert (
+        client.session.get(PlayerDetails.session_key) != episode_id
+    ), f"Episode {episode_id} in sesssion"
+
 
+def save_episode_to_player(client, episode_id):
     session = client.session
-    session[PlayerDetails.session_key] = episode.pk
+    session[PlayerDetails.session_key] = episode_id
     session.save()
 
+
+@pytest.fixture
+def player_episode(auth_user, client, episode):
+    AudioLogFactory(user=auth_user, episode=episode)
+    save_episode_to_player(client, episode.pk)
     return episode
 
 
@@ -212,7 +226,7 @@ def test_play_from_start(self, client, auth_user, episode):
         )
 
         assert AudioLog.objects.filter(user=auth_user, episode=episode).exists()
-        assert client.session[PlayerDetails.session_key] == episode.pk
+        assert_episode_in_player(client, episode.pk)
 
     @pytest.mark.django_db
     def test_another_episode_in_player(self, client, auth_user, player_episode):
@@ -229,7 +243,7 @@ def test_another_episode_in_player(self, client, auth_user, player_episode):
 
         assert AudioLog.objects.filter(user=auth_user, episode=episode).exists()
 
-        assert client.session[PlayerDetails.session_key] == episode.pk
+        assert_episode_in_player(client, episode.pk)
 
     @pytest.mark.django_db
     def test_resume(self, client, auth_user, player_episode):
@@ -243,7 +257,7 @@ def test_resume(self, client, auth_user, player_episode):
             )
         )
 
-        assert client.session[PlayerDetails.session_key] == player_episode.pk
+        assert_episode_in_player(client, player_episode.pk)
 
 
 class TestClosePlayer:
@@ -279,7 +293,7 @@ def test_close(
 
         assert not response.context["is_playing"]
 
-        assert player_episode.pk not in client.session
+        assert_episode_not_in_player(client, player_episode.pk)
 
 
 class TestPlayerTimeUpdate:
@@ -300,10 +314,7 @@ def test_is_running(self, client, player_episode):
 
     @pytest.mark.django_db
     def test_player_log_missing(self, client, auth_user, episode):
-        session = client.session
-        session[PlayerDetails.session_key] = episode.pk
-        session.save()
-
+        save_episode_to_player(client, episode.pk)
         assert_204(
             client.post(
                 self.url,