Rebase fixes

test/test_spotify_tools.py

@@ -6,23 +6,26 @@ import loader
 
 loader.load_defaults()
 
+@pytest.fixture(scope="module")
+def spotify():
+    return spotify_tools.SpotifyAuthorize()
 
-def test_generate_token():
-    token = spotify_tools.generate_token()
+def test_generate_token(spotify):
+    token = spotify.generate_token()
     assert len(token) == 83
 
 
-def test_refresh_token():
-    old_instance = spotify_tools.spotify
-    spotify_tools.refresh_token()
-    new_instance = spotify_tools.spotify
+def test_refresh_token(spotify):
+    old_instance = spotify.spotify
+    spotify.refresh_token()
+    new_instance = spotify.spotify
     assert not old_instance == new_instance
 
 
 class TestGenerateMetadata:
     @pytest.fixture(scope="module")
-    def metadata_fixture(self):
-        metadata = spotify_tools.generate_metadata("ncs - spectre")
+    def metadata_fixture(self, spotify):
+        metadata = spotify.generate_metadata("ncs - spectre")
         return metadata
 
     def test_len(self, metadata_fixture):
@@ -38,7 +41,7 @@ class TestGenerateMetadata:
         assert metadata_fixture["duration"] == 230.634
 
 
-def test_get_playlists():
+def test_get_playlists(spotify):
     expect_playlist_ids = [
         "34gWCK8gVeYDPKcctB6BQJ",
         "04wTU2c2WNQG9XE5oSLYfj",
@@ -50,15 +53,15 @@ def test_get_playlists():
         for playlist_id in expect_playlist_ids
     ]
 
-    playlists = spotify_tools.get_playlists("uqlakumu7wslkoen46s5bulq0")
+    playlists = spotify.get_playlists("uqlakumu7wslkoen46s5bulq0")
     assert playlists == expect_playlists
 
 
-def test_write_user_playlist(tmpdir, monkeypatch):
+def test_write_user_playlist(tmpdir, spotify, monkeypatch):
     expect_tracks = 17
     text_file = os.path.join(str(tmpdir), "test_us.txt")
     monkeypatch.setattr("builtins.input", lambda x: 1)
-    spotify_tools.write_user_playlist("uqlakumu7wslkoen46s5bulq0", text_file)
+    spotify.write_user_playlist("uqlakumu7wslkoen46s5bulq0", text_file)
     with open(text_file, "r") as f:
         tracks = len(f.readlines())
     assert tracks == expect_tracks
@@ -66,8 +69,8 @@ def test_write_user_playlist(tmpdir, monkeypatch):
 
 class TestFetchPlaylist:
     @pytest.fixture(scope="module")
-    def playlist_fixture(self):
-        playlist = spotify_tools.fetch_playlist(
+    def playlist_fixture(self, spotify):
+        playlist = spotify.fetch_playlist(
             "https://open.spotify.com/playlist/0fWBMhGh38y0wsYWwmM9Kt"
         )
         return playlist
@@ -79,10 +82,10 @@ class TestFetchPlaylist:
         assert playlist_fixture["tracks"]["total"] == 14
 
 
-def test_write_playlist(tmpdir):
+def test_write_playlist(tmpdir, spotify):
     expect_tracks = 14
     text_file = os.path.join(str(tmpdir), "test_pl.txt")
-    spotify_tools.write_playlist(
+    spotify.write_playlist(
         "https://open.spotify.com/playlist/0fWBMhGh38y0wsYWwmM9Kt", text_file
     )
     with open(text_file, "r") as f:
@@ -93,8 +96,8 @@ def test_write_playlist(tmpdir):
 # XXX: Mock this test off if it fails in future
 class TestFetchAlbum:
     @pytest.fixture(scope="module")
-    def album_fixture(self):
-        album = spotify_tools.fetch_album(
+    def album_fixture(self, spotify):
+        album = spotify.fetch_album(
             "https://open.spotify.com/album/499J8bIsEnU7DSrosFDJJg"
         )
         return album
@@ -109,14 +112,13 @@ class TestFetchAlbum:
 # XXX: Mock this test off if it fails in future
 class TestFetchAlbumsFromArtist:
     @pytest.fixture(scope="module")
-    def albums_from_artist_fixture(self):
-        albums = spotify_tools.fetch_albums_from_artist(
+    def albums_from_artist_fixture(self, spotify):
+        albums = spotify.fetch_albums_from_artist(
             "https://open.spotify.com/artist/7oPftvlwr6VrsViSDV7fJY"
         )
         return albums
 
     def test_len(self, albums_from_artist_fixture):
-        # TODO: Mock this test (failed in #493)
         assert len(albums_from_artist_fixture) == 52
 
     def test_zeroth_album_name(self, albums_from_artist_fixture):
@@ -132,11 +134,10 @@ class TestFetchAlbumsFromArtist:
         assert albums_from_artist_fixture[0]["total_tracks"] == 12
 
 
-# TODO: Mock this test (failed in #493)
-def test_write_all_albums_from_artist(tmpdir):
+def test_write_all_albums_from_artist(tmpdir, spotify):
     expect_tracks = 282
     text_file = os.path.join(str(tmpdir), "test_ab.txt")
-    spotify_tools.write_all_albums_from_artist(
+    spotify.write_all_albums_from_artist(
         "https://open.spotify.com/artist/4dpARuHxo51G3z768sgnrY", text_file
     )
     with open(text_file, "r") as f:
@@ -144,10 +145,10 @@ def test_write_all_albums_from_artist(tmpdir):
     assert tracks == expect_tracks
 
 
-def test_write_album(tmpdir):
+def test_write_album(tmpdir, spotify):
     expect_tracks = 15
     text_file = os.path.join(str(tmpdir), "test_al.txt")
-    spotify_tools.write_album(
+    spotify.write_album(
         "https://open.spotify.com/album/499J8bIsEnU7DSrosFDJJg", text_file
     )
     with open(text_file, "r") as f: