See #1100: clean compat and XXX in the code

api/tests/music/test_serializers.py

@@ -196,15 +196,6 @@ def test_album_serializer(factories, to_api_date):
     assert serializer.data == expected
 
 
-def test_album_serializer_empty_cover(factories, to_api_date):
-    # XXX: BACKWARD COMPATIBILITY
-    album = factories["music.Album"](attachment_cover=None)
-
-    serializer = serializers.AlbumSerializer(album)
-
-    assert serializer.data["cover"] == {}
-
-
 def test_track_serializer(factories, to_api_date):
     actor = factories["federation.Actor"]()
     upload = factories["music.Upload"](

api/tests/music/test_tasks.py

@@ -660,7 +660,7 @@ def test_federation_audio_track_to_metadata(now, mocker):
                     },
                 }
             ],
-            "cover": {
+            "image": {
                 "type": "Link",
                 "href": "http://cover.test",
                 "mediaType": "image/png",
@@ -713,8 +713,8 @@ def test_federation_audio_track_to_metadata(now, mocker):
             "tags": ["AlbumTag"],
             "description": {"content_type": "text/plain", "text": "album desc"},
             "cover_data": {
-                "mimetype": serializer.validated_data["album"]["cover"]["mediaType"],
-                "url": serializer.validated_data["album"]["cover"]["href"],
+                "mimetype": serializer.validated_data["album"]["image"]["mediaType"],
+                "url": serializer.validated_data["album"]["image"]["href"],
             },
             "artists": [
                 {

api/tests/music/test_views.py

@@ -1307,9 +1307,7 @@ def test_get_upload_audio_metadata(logged_in_api_client, factories):
     assert response.data == serializer.validated_data
 
 
-@pytest.mark.parametrize("use_fts", [True, False])
-def test_search_get(use_fts, settings, logged_in_api_client, factories):
-    settings.USE_FULL_TEXT_SEARCH = use_fts
+def test_search_get(logged_in_api_client, factories):
     artist = factories["music.Artist"](name="Foo Fighters")
     album = factories["music.Album"](title="Foo Bar")
     track = factories["music.Track"](title="Foo Baz")
@@ -1332,8 +1330,7 @@ def test_search_get(use_fts, settings, logged_in_api_client, factories):
     assert response.data == expected
 
 
-def test_search_get_fts_advanced(settings, logged_in_api_client, factories):
-    settings.USE_FULL_TEXT_SEARCH = True
+def test_search_get_fts_advanced(logged_in_api_client, factories):
     artist1 = factories["music.Artist"](name="Foo Bighters")
     artist2 = factories["music.Artist"](name="Bar Fighter")
     factories["music.Artist"]()
@@ -1353,8 +1350,7 @@ def test_search_get_fts_advanced(settings, logged_in_api_client, factories):
     assert response.data == expected
 
 
-def test_search_get_fts_stop_words(settings, logged_in_api_client, factories):
-    settings.USE_FULL_TEXT_SEARCH = True
+def test_search_get_fts_stop_words(logged_in_api_client, factories):
     artist = factories["music.Artist"](name="she")
     factories["music.Artist"](name="something else")