From 11a5c6248d149f9261dbc57cc98d3246610dccd4 Mon Sep 17 00:00:00 2001 From: sanojjonas7 Date: Sun, 15 Dec 2024 23:28:22 +0100 Subject: [PATCH 1/5] MBS-12170: always give country for artists --- .../Server/WebService/Serializer/JSON/2/Artist.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Artist.pm b/lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Artist.pm index 35992301cc3..fc521df0e35 100644 --- a/lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Artist.pm +++ b/lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Artist.pm @@ -13,14 +13,14 @@ sub serialize $body{'sort-name'} = $entity->sort_name; $body{disambiguation} = $entity->comment // ''; + $body{country} = $entity->area && $entity->area->country_code + ? $entity->area->country_code : JSON::null; + if ($toplevel) { $body{gender} = $entity->gender ? $entity->gender_name : JSON::null; $body{'gender-id'} = $entity->gender ? $entity->gender->gid : JSON::null; - $body{country} = $entity->area && $entity->area->country_code - ? $entity->area->country_code : JSON::null; - $body{area} = $entity->area ? serialize_entity($entity->area) : JSON::null; $body{'begin-area'} = $entity->begin_area ? serialize_entity($entity->begin_area) : JSON::null; $body{'end-area'} = $entity->end_area ? serialize_entity($entity->end_area) : JSON::null; From 6351fac0da63aa984be4278893ea87db2b883e02 Mon Sep 17 00:00:00 2001 From: sanojjonas7 Date: Mon, 16 Dec 2024 20:37:35 +0100 Subject: [PATCH 2/5] MBS-12170: try to fix the tests --- .../Server/Controller/WS/2/BrowseRelease.pm | 2 + .../Controller/WS/2/BrowseReleaseGroup.pm | 4 ++ .../Server/Controller/WS/2/LookupArtist.pm | 18 ++++++++ .../Server/Controller/WS/2/LookupRecording.pm | 4 ++ .../Server/Controller/WS/2/LookupRelease.pm | 43 +++++++++++++++++++ .../Controller/WS/2/LookupReleaseGroup.pm | 3 ++ .../Server/Controller/WS/2/LookupURL.pm | 1 + 7 files changed, 75 insertions(+) diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseRelease.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseRelease.pm index 555f8487dde..ea16bad5980 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseRelease.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseRelease.pm @@ -433,6 +433,7 @@ ws_test 'browse releases via recording, with recording and work rels', Blind Melon Blind Melon + US @@ -460,6 +461,7 @@ ws_test 'browse releases via recording, with recording and work rels', Paul Allgood Allgood, Paul + US diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseReleaseGroup.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseReleaseGroup.pm index e4e59b1ea12..4e0c32fd898 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseReleaseGroup.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseReleaseGroup.pm @@ -34,6 +34,7 @@ ws_test 'browse release group via release', Distance UK dubstep artist Greg Sanders 5 + GB @@ -63,6 +64,7 @@ ws_test 'browse release group via artist', Distance UK dubstep artist Greg Sanders 5 + GB @@ -87,6 +89,7 @@ ws_test 'browse release group via artist', Distance UK dubstep artist Greg Sanders 5 + GB @@ -117,6 +120,7 @@ ws_test 'browse official release groups via artist', Distance UK dubstep artist Greg Sanders 5 + GB diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupArtist.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupArtist.pm index 8943ce74e70..521b7f700fe 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupArtist.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupArtist.pm @@ -33,6 +33,7 @@ ws_test 'basic artist lookup', DistanceDistance UK dubstep artist Greg Sanders + GB '; @@ -55,6 +56,7 @@ ws_test 'artist lookup, inc=aliases', BoABoA + KR 1986-11-05 @@ -76,6 +78,7 @@ ws_test 'artist lookup, inc=annotation', DistanceDistance this is an artist annotation UK dubstep artist Greg Sanders + GB '; @@ -85,6 +88,7 @@ ws_test 'artist lookup with releases', 7人祭7nin Matsuri + JP Summer Reggae! Rainbow @@ -144,6 +148,7 @@ ws_test 'artist lookup with pseudo-releases', 7人祭7nin Matsuri + JP Summer Reggae! Rainbow @@ -179,6 +184,7 @@ ws_test 'artist lookup with releases and discids', DistanceDistanceUK dubstep artist Greg Sanders + GB My Demons @@ -309,6 +315,7 @@ ws_test 'artist lookup with recordings and artist credits', m-flom-flo + JP 1998 @@ -320,12 +327,14 @@ ws_test 'artist lookup with recordings and artist credits', m-flo m-flo + JP BoA BoA + KR @@ -337,12 +346,14 @@ ws_test 'artist lookup with recordings and artist credits', m-flo m-flo + JP BoA BoA + KR @@ -357,6 +368,7 @@ ws_test 'artist lookup with release groups', m-flom-flo + JP 1998 @@ -376,6 +388,7 @@ ws_test 'single artist release lookup', m-flom-flo + JP 1998 @@ -414,6 +427,7 @@ ws_test 'various artists release lookup', BoA BoA + KR 1986-11-05 @@ -458,6 +472,7 @@ ws_test 'artist lookup with works (using l_artist_work)', DistanceDistance UK dubstep artist Greg Sanders + GB Asseswaving @@ -476,6 +491,7 @@ ws_test 'artist lookup with works (using l_recording_work)', BoABoA + KR 1986-11-05 Be the one @@ -524,6 +540,7 @@ ws_test 'artist lookup with artist relations', 7人祭 7nin Matsuri + JP Maki Goto 7nin Matsuri @@ -539,6 +556,7 @@ ws_test 'artist lookup with event relations', Paul Allgood Allgood, Paul + US 166359d1-5a63-4033-945c-a6707844fb19 diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRecording.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRecording.pm index 86fae294108..0788ce30a1f 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRecording.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRecording.pm @@ -196,11 +196,13 @@ ws_test 'recording lookup with artists', m-flom-flo + JP BoABoA + KR @@ -234,6 +236,7 @@ ws_test 'recording lookup with release relationships and artist credits', Wedlock Wedlock USA electro pop + US @@ -251,6 +254,7 @@ ws_test 'recording lookup with release relationships and artist credits', Paul Allgood Allgood, Paul + US diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRelease.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRelease.pm index 072fa8bc079..64826e73648 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRelease.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRelease.pm @@ -289,6 +289,7 @@ ws_test 'release lookup with artists + aliases', m-flom-flo + JP m-flow mediarite-flow crew @@ -428,6 +429,7 @@ ws_test 'release lookup with release-groups and ratings', m-flo m-flo + JP 3 @@ -441,6 +443,7 @@ ws_test 'release lookup with release-groups and ratings', m-flo m-flo + JP 3 @@ -761,6 +764,7 @@ ws_test 'release lookup, relation attributes', 이수만 Lee, Soo-Man + KR @@ -810,6 +814,7 @@ ws_test 'release lookup, related artists have no tags', PlonePlone + GB british @@ -867,6 +872,7 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone + GB @@ -883,6 +889,7 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone + GB @@ -899,6 +906,7 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone + GB @@ -915,6 +923,7 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone + GB @@ -931,6 +940,7 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone + GB @@ -947,6 +957,7 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone + GB @@ -963,6 +974,7 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone + GB @@ -979,6 +991,7 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone + GB @@ -995,6 +1008,7 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone + GB @@ -1011,6 +1025,7 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone + GB @@ -1026,6 +1041,7 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone + GB @@ -1047,6 +1063,7 @@ ws_test 'release lookup, track artists have no aliases', m-flom-flo + JP m-flowmediarite-flow crewmeteorite-flow crewmfloえむふろうエムフロウ @@ -1082,6 +1099,7 @@ ws_test 'release lookup, track artists have no aliases', m-flom-flo + JP m-flowmediarite-flow crewmeteorite-flow crewmfloえむふろうエムフロウ @@ -1090,6 +1108,7 @@ ws_test 'release lookup, track artists have no aliases', BoABoA + KR Beat of Angel BoA Kwon @@ -1106,6 +1125,7 @@ ws_test 'release lookup, track artists have no aliases', backward m-flom-flo + JP @@ -1113,6 +1133,7 @@ ws_test 'release lookup, track artists have no aliases', backward m-flom-flo + JP @@ -1123,6 +1144,7 @@ ws_test 'release lookup, track artists have no aliases', BoABoA + KR @@ -1137,6 +1159,7 @@ ws_test 'release lookup, track artists have no aliases', m-flom-flo + JP m-flowmediarite-flow crewmeteorite-flow crewmfloえむふろうエムフロウ @@ -1145,6 +1168,7 @@ ws_test 'release lookup, track artists have no aliases', BoABoA + KR Beat of Angel BoA Kwon @@ -1166,6 +1190,7 @@ ws_test 'release lookup, track artists have no aliases', BAGDAD CAFE THE trench townBAGDAD CAFE THE trench town + JP @@ -1195,6 +1220,7 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone + GB british @@ -1260,6 +1286,7 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone + GB british @@ -1301,6 +1328,7 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone + GB british @@ -1342,6 +1370,7 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone + GB british @@ -1383,6 +1412,7 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone + GB british @@ -1424,6 +1454,7 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone + GB british @@ -1465,6 +1496,7 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone + GB british @@ -1506,6 +1538,7 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone + GB british @@ -1547,6 +1580,7 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone + GB british @@ -1588,6 +1622,7 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone + GB british @@ -1629,6 +1664,7 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone + GB british @@ -1681,6 +1717,7 @@ ws_test 'release lookup, pregap track', Blind Melon Blind Melon + US @@ -1707,6 +1744,7 @@ ws_test 'release lookup, pregap track', Blind Melon Blind Melon + US @@ -1726,6 +1764,7 @@ ws_test 'release lookup, pregap track', Blind Melon Blind Melon + US @@ -1743,6 +1782,7 @@ ws_test 'release lookup, pregap track', Blind Melon Blind Melon + US @@ -1774,6 +1814,7 @@ test 'MBS-7914' => sub { Gustav Mahler Mahler, Gustav + AT グスタフ・マーラー @@ -1798,6 +1839,7 @@ test 'MBS-7914' => sub { Gustav Mahler Mahler, Gustav + AT グスタフ・マーラー @@ -1811,6 +1853,7 @@ test 'MBS-7914' => sub { Chicago Symphony Orchestra Chicago Symphony Orchestra + US CSO diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupReleaseGroup.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupReleaseGroup.pm index 902e944a13c..51859ebbd54 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupReleaseGroup.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupReleaseGroup.pm @@ -97,6 +97,7 @@ ws_test 'release group lookup with artists', DistanceDistanceUK dubstep artist Greg Sanders + GB @@ -115,6 +116,7 @@ ws_test 'release group lookup with inc=artists+releases+tags+ratings', m-flom-flo + JP 3 @@ -160,6 +162,7 @@ ws_test 'release group lookup with pseudo-releases', m-flom-flo + JP diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupURL.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupURL.pm index 4a4d85bbc16..6d9a39ff6aa 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupURL.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupURL.pm @@ -51,6 +51,7 @@ ws_test 'basic url lookup (with inc=artist-rels)', Paul Allgood Allgood, Paul + US From 03e59a596d39d1f5b0e1191fb51f6b7a07db68cf Mon Sep 17 00:00:00 2001 From: sanojjonas7 Date: Mon, 16 Dec 2024 21:04:49 +0100 Subject: [PATCH 3/5] Revert "MBS-12170: try to fix the tests" This reverts commit 6351fac0da63aa984be4278893ea87db2b883e02. --- .../Server/Controller/WS/2/BrowseRelease.pm | 2 - .../Controller/WS/2/BrowseReleaseGroup.pm | 4 -- .../Server/Controller/WS/2/LookupArtist.pm | 18 -------- .../Server/Controller/WS/2/LookupRecording.pm | 4 -- .../Server/Controller/WS/2/LookupRelease.pm | 43 ------------------- .../Controller/WS/2/LookupReleaseGroup.pm | 3 -- .../Server/Controller/WS/2/LookupURL.pm | 1 - 7 files changed, 75 deletions(-) diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseRelease.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseRelease.pm index ea16bad5980..555f8487dde 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseRelease.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseRelease.pm @@ -433,7 +433,6 @@ ws_test 'browse releases via recording, with recording and work rels', Blind Melon Blind Melon - US @@ -461,7 +460,6 @@ ws_test 'browse releases via recording, with recording and work rels', Paul Allgood Allgood, Paul - US diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseReleaseGroup.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseReleaseGroup.pm index 4e0c32fd898..e4e59b1ea12 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseReleaseGroup.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/BrowseReleaseGroup.pm @@ -34,7 +34,6 @@ ws_test 'browse release group via release', Distance UK dubstep artist Greg Sanders 5 - GB @@ -64,7 +63,6 @@ ws_test 'browse release group via artist', Distance UK dubstep artist Greg Sanders 5 - GB @@ -89,7 +87,6 @@ ws_test 'browse release group via artist', Distance UK dubstep artist Greg Sanders 5 - GB @@ -120,7 +117,6 @@ ws_test 'browse official release groups via artist', Distance UK dubstep artist Greg Sanders 5 - GB diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupArtist.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupArtist.pm index 521b7f700fe..8943ce74e70 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupArtist.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupArtist.pm @@ -33,7 +33,6 @@ ws_test 'basic artist lookup', DistanceDistance UK dubstep artist Greg Sanders - GB '; @@ -56,7 +55,6 @@ ws_test 'artist lookup, inc=aliases', BoABoA - KR 1986-11-05 @@ -78,7 +76,6 @@ ws_test 'artist lookup, inc=annotation', DistanceDistance this is an artist annotation UK dubstep artist Greg Sanders - GB '; @@ -88,7 +85,6 @@ ws_test 'artist lookup with releases', 7人祭7nin Matsuri - JP Summer Reggae! Rainbow @@ -148,7 +144,6 @@ ws_test 'artist lookup with pseudo-releases', 7人祭7nin Matsuri - JP Summer Reggae! Rainbow @@ -184,7 +179,6 @@ ws_test 'artist lookup with releases and discids', DistanceDistanceUK dubstep artist Greg Sanders - GB My Demons @@ -315,7 +309,6 @@ ws_test 'artist lookup with recordings and artist credits', m-flom-flo - JP 1998 @@ -327,14 +320,12 @@ ws_test 'artist lookup with recordings and artist credits', m-flo m-flo - JP BoA BoA - KR @@ -346,14 +337,12 @@ ws_test 'artist lookup with recordings and artist credits', m-flo m-flo - JP BoA BoA - KR @@ -368,7 +357,6 @@ ws_test 'artist lookup with release groups', m-flom-flo - JP 1998 @@ -388,7 +376,6 @@ ws_test 'single artist release lookup', m-flom-flo - JP 1998 @@ -427,7 +414,6 @@ ws_test 'various artists release lookup', BoA BoA - KR 1986-11-05 @@ -472,7 +458,6 @@ ws_test 'artist lookup with works (using l_artist_work)', DistanceDistance UK dubstep artist Greg Sanders - GB Asseswaving @@ -491,7 +476,6 @@ ws_test 'artist lookup with works (using l_recording_work)', BoABoA - KR 1986-11-05 Be the one @@ -540,7 +524,6 @@ ws_test 'artist lookup with artist relations', 7人祭 7nin Matsuri - JP Maki Goto 7nin Matsuri @@ -556,7 +539,6 @@ ws_test 'artist lookup with event relations', Paul Allgood Allgood, Paul - US 166359d1-5a63-4033-945c-a6707844fb19 diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRecording.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRecording.pm index 0788ce30a1f..86fae294108 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRecording.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRecording.pm @@ -196,13 +196,11 @@ ws_test 'recording lookup with artists', m-flom-flo - JP BoABoA - KR @@ -236,7 +234,6 @@ ws_test 'recording lookup with release relationships and artist credits', Wedlock Wedlock USA electro pop - US @@ -254,7 +251,6 @@ ws_test 'recording lookup with release relationships and artist credits', Paul Allgood Allgood, Paul - US diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRelease.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRelease.pm index 64826e73648..072fa8bc079 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRelease.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupRelease.pm @@ -289,7 +289,6 @@ ws_test 'release lookup with artists + aliases', m-flom-flo - JP m-flow mediarite-flow crew @@ -429,7 +428,6 @@ ws_test 'release lookup with release-groups and ratings', m-flo m-flo - JP 3 @@ -443,7 +441,6 @@ ws_test 'release lookup with release-groups and ratings', m-flo m-flo - JP 3 @@ -764,7 +761,6 @@ ws_test 'release lookup, relation attributes', 이수만 Lee, Soo-Man - KR @@ -814,7 +810,6 @@ ws_test 'release lookup, related artists have no tags', PlonePlone - GB british @@ -872,7 +867,6 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone - GB @@ -889,7 +883,6 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone - GB @@ -906,7 +899,6 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone - GB @@ -923,7 +915,6 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone - GB @@ -940,7 +931,6 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone - GB @@ -957,7 +947,6 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone - GB @@ -974,7 +963,6 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone - GB @@ -991,7 +979,6 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone - GB @@ -1008,7 +995,6 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone - GB @@ -1025,7 +1011,6 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone - GB @@ -1041,7 +1026,6 @@ ws_test 'release lookup, related artists have no tags', backward PlonePlone - GB @@ -1063,7 +1047,6 @@ ws_test 'release lookup, track artists have no aliases', m-flom-flo - JP m-flowmediarite-flow crewmeteorite-flow crewmfloえむふろうエムフロウ @@ -1099,7 +1082,6 @@ ws_test 'release lookup, track artists have no aliases', m-flom-flo - JP m-flowmediarite-flow crewmeteorite-flow crewmfloえむふろうエムフロウ @@ -1108,7 +1090,6 @@ ws_test 'release lookup, track artists have no aliases', BoABoA - KR Beat of Angel BoA Kwon @@ -1125,7 +1106,6 @@ ws_test 'release lookup, track artists have no aliases', backward m-flom-flo - JP @@ -1133,7 +1113,6 @@ ws_test 'release lookup, track artists have no aliases', backward m-flom-flo - JP @@ -1144,7 +1123,6 @@ ws_test 'release lookup, track artists have no aliases', BoABoA - KR @@ -1159,7 +1137,6 @@ ws_test 'release lookup, track artists have no aliases', m-flom-flo - JP m-flowmediarite-flow crewmeteorite-flow crewmfloえむふろうエムフロウ @@ -1168,7 +1145,6 @@ ws_test 'release lookup, track artists have no aliases', BoABoA - KR Beat of Angel BoA Kwon @@ -1190,7 +1166,6 @@ ws_test 'release lookup, track artists have no aliases', BAGDAD CAFE THE trench townBAGDAD CAFE THE trench town - JP @@ -1220,7 +1195,6 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone - GB british @@ -1286,7 +1260,6 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone - GB british @@ -1328,7 +1301,6 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone - GB british @@ -1370,7 +1342,6 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone - GB british @@ -1412,7 +1383,6 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone - GB british @@ -1454,7 +1424,6 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone - GB british @@ -1496,7 +1465,6 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone - GB british @@ -1538,7 +1506,6 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone - GB british @@ -1580,7 +1547,6 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone - GB british @@ -1622,7 +1588,6 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone - GB british @@ -1664,7 +1629,6 @@ ws_test 'release lookup, tags are not duplicated for artists that are both relea Plone Plone - GB british @@ -1717,7 +1681,6 @@ ws_test 'release lookup, pregap track', Blind Melon Blind Melon - US @@ -1744,7 +1707,6 @@ ws_test 'release lookup, pregap track', Blind Melon Blind Melon - US @@ -1764,7 +1726,6 @@ ws_test 'release lookup, pregap track', Blind Melon Blind Melon - US @@ -1782,7 +1743,6 @@ ws_test 'release lookup, pregap track', Blind Melon Blind Melon - US @@ -1814,7 +1774,6 @@ test 'MBS-7914' => sub { Gustav Mahler Mahler, Gustav - AT グスタフ・マーラー @@ -1839,7 +1798,6 @@ test 'MBS-7914' => sub { Gustav Mahler Mahler, Gustav - AT グスタフ・マーラー @@ -1853,7 +1811,6 @@ test 'MBS-7914' => sub { Chicago Symphony Orchestra Chicago Symphony Orchestra - US CSO diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupReleaseGroup.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupReleaseGroup.pm index 51859ebbd54..902e944a13c 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupReleaseGroup.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupReleaseGroup.pm @@ -97,7 +97,6 @@ ws_test 'release group lookup with artists', DistanceDistanceUK dubstep artist Greg Sanders - GB @@ -116,7 +115,6 @@ ws_test 'release group lookup with inc=artists+releases+tags+ratings', m-flom-flo - JP 3 @@ -162,7 +160,6 @@ ws_test 'release group lookup with pseudo-releases', m-flom-flo - JP diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupURL.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupURL.pm index 6d9a39ff6aa..4a4d85bbc16 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupURL.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/LookupURL.pm @@ -51,7 +51,6 @@ ws_test 'basic url lookup (with inc=artist-rels)', Paul Allgood Allgood, Paul - US From 25b37c72753127947299cac904d45c668a53577f Mon Sep 17 00:00:00 2001 From: sanojjonas7 Date: Mon, 16 Dec 2024 21:40:44 +0100 Subject: [PATCH 4/5] MBS-12170: try to fix the tests part 2 --- .../WS/2/JSON/BrowseReleaseGroups.pm | 4 +++ .../Controller/WS/2/JSON/BrowseReleases.pm | 2 ++ .../Controller/WS/2/JSON/LookupArtist.pm | 5 ++++ .../Controller/WS/2/JSON/LookupRecording.pm | 6 ++++ .../Controller/WS/2/JSON/LookupRelease.pm | 29 +++++++++++++++++++ .../WS/2/JSON/LookupReleaseGroup.pm | 3 ++ .../Server/Controller/WS/2/JSON/LookupURL.pm | 1 + 7 files changed, 50 insertions(+) diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/BrowseReleaseGroups.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/BrowseReleaseGroups.pm index b9f3c913546..581a6a767bd 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/BrowseReleaseGroups.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/BrowseReleaseGroups.pm @@ -37,6 +37,7 @@ test 'browse release group via release' => sub { name => 'Distance', 'sort-name' => 'Distance', disambiguation => 'UK dubstep artist Greg Sanders', + country => 'GB', tags => [], genres => [], 'type' => 'Person', @@ -84,6 +85,7 @@ test 'browse release group via artist' => sub { name => 'Distance', 'sort-name' => 'Distance', disambiguation => 'UK dubstep artist Greg Sanders', + country => 'GB', tags => [], genres => [], 'type' => 'Person', @@ -118,6 +120,7 @@ test 'browse release group via artist' => sub { name => 'Distance', 'sort-name' => 'Distance', disambiguation => 'UK dubstep artist Greg Sanders', + country => 'GB', tags => [], genres => [], 'type' => 'Person', @@ -172,6 +175,7 @@ test 'browse official release groups via artist' => sub { name => 'Distance', 'sort-name' => 'Distance', disambiguation => 'UK dubstep artist Greg Sanders', + country => 'GB', tags => [], genres => [], 'type' => 'Person', diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/BrowseReleases.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/BrowseReleases.pm index 2e5775cca84..6d83b263d71 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/BrowseReleases.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/BrowseReleases.pm @@ -342,6 +342,7 @@ test 'browse releases via recording, with recording rels' => sub { 'sort-name' => 'Blind Melon', disambiguation => '', name => 'Blind Melon', + country => 'US', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -383,6 +384,7 @@ test 'browse releases via recording, with recording rels' => sub { 'sort-name' => 'Allgood, Paul', disambiguation => '', name => 'Paul Allgood', + country => 'US', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', }, diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm index f317be2c6e1..da0fe83907e 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm @@ -656,6 +656,7 @@ test 'artist lookup with recordings and artist credits' => sub { name => 'm-flo', 'sort-name' => 'm-flo', disambiguation => '', + country => 'JP', type => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -668,6 +669,7 @@ test 'artist lookup with recordings and artist credits' => sub { name => 'BoA', 'sort-name' => 'BoA', disambiguation => '', + country => 'KR', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', }, @@ -689,6 +691,7 @@ test 'artist lookup with recordings and artist credits' => sub { name => 'm-flo', 'sort-name' => 'm-flo', disambiguation => '', + country => 'JP', type => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -701,6 +704,7 @@ test 'artist lookup with recordings and artist credits' => sub { name => 'BoA', 'sort-name' => 'BoA', disambiguation => '', + country => 'KR', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', }, @@ -1154,6 +1158,7 @@ test 'artist lookup with artist relations' => sub { name => '7人祭', 'sort-name' => '7nin Matsuri', disambiguation => '', + country => 'JP', type => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRecording.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRecording.pm index 80d03b1d47e..f8548c27815 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRecording.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRecording.pm @@ -135,6 +135,7 @@ test 'recording lookup with releases, release-groups, and artists' => sub { type => 'Group', name => '7人祭', disambiguation => '', + country => 'JP', id => '802673f0-9b88-4e8a-bb5c-dd01d68b086f', 'sort-name' => '7nin Matsuri', }, @@ -358,6 +359,7 @@ test 'recording lookup with artists' => sub { name => 'm-flo', 'sort-name' => 'm-flo', disambiguation => '', + country => 'JP', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -370,6 +372,7 @@ test 'recording lookup with artists' => sub { name => 'BoA', 'sort-name' => 'BoA', disambiguation => '', + country => 'KR', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', }, @@ -413,6 +416,7 @@ test 'recording lookup with release relationships' => sub { name => 'Wedlock', 'sort-name' => 'Wedlock', disambiguation => 'USA electro pop', + country => 'US', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -443,6 +447,7 @@ test 'recording lookup with release relationships' => sub { name => 'Paul Allgood', 'sort-name' => 'Allgood, Paul', disambiguation => '', + country => 'US', 'type' => JSON::null, 'type-id' => JSON::null, }, @@ -563,6 +568,7 @@ test 'recording lookup with work-level relationships' => sub { disambiguation => 'UK dubstep artist Greg Sanders', id => '472bc127-8861-45e8-bc9e-31e8dd32de7a', name => 'Distance', + country => 'GB', 'sort-name' => 'Distance', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRelease.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRelease.pm index bcc5ab4b418..96f28199edc 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRelease.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRelease.pm @@ -330,6 +330,7 @@ test 'release lookup with artists + aliases' => sub { name => 'm-flo', 'sort-name' => 'm-flo', disambiguation => '', + country => 'JP', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', aliases => [ @@ -573,6 +574,7 @@ test 'release lookup with release-groups' => sub { name => 'm-flo', 'sort-name' => 'm-flo', disambiguation => '', + country => 'JP', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -596,6 +598,7 @@ test 'release lookup with release-groups' => sub { name => 'm-flo', 'sort-name' => 'm-flo', disambiguation => '', + country => 'JP', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -1043,6 +1046,7 @@ test 'release lookup, relation attributes' => sub { 'sort-name' => 'Lee, Soo-Man', disambiguation => '', name => '이수만', + country => 'KR', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', }, @@ -1113,6 +1117,7 @@ test 'release lookup, related artists have no tags/genres' => sub { id => '3088b672-fba9-4b4b-8ae0-dce13babfbb4', name => 'Plone', 'sort-name' => 'Plone', + country => 'GB', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', tags => [ @@ -1171,6 +1176,7 @@ test 'release lookup, related artists have no tags/genres' => sub { id => '3088b672-fba9-4b4b-8ae0-dce13babfbb4', name => 'Plone', 'sort-name' => 'Plone', + country => 'GB', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -1211,6 +1217,7 @@ test 'release lookup, related artists have no tags/genres' => sub { id => '3088b672-fba9-4b4b-8ae0-dce13babfbb4', name => 'Plone', 'sort-name' => 'Plone', + country => 'GB', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -1250,6 +1257,7 @@ test 'release lookup, related artists have no tags/genres' => sub { id => '3088b672-fba9-4b4b-8ae0-dce13babfbb4', name => 'Plone', 'sort-name' => 'Plone', + country => 'GB', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -1289,6 +1297,7 @@ test 'release lookup, related artists have no tags/genres' => sub { id => '3088b672-fba9-4b4b-8ae0-dce13babfbb4', name => 'Plone', 'sort-name' => 'Plone', + country => 'GB', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -1328,6 +1337,7 @@ test 'release lookup, related artists have no tags/genres' => sub { id => '3088b672-fba9-4b4b-8ae0-dce13babfbb4', name => 'Plone', 'sort-name' => 'Plone', + country => 'GB', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -1367,6 +1377,7 @@ test 'release lookup, related artists have no tags/genres' => sub { id => '3088b672-fba9-4b4b-8ae0-dce13babfbb4', name => 'Plone', 'sort-name' => 'Plone', + country => 'GB', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -1406,6 +1417,7 @@ test 'release lookup, related artists have no tags/genres' => sub { id => '3088b672-fba9-4b4b-8ae0-dce13babfbb4', name => 'Plone', 'sort-name' => 'Plone', + country => 'GB', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -1445,6 +1457,7 @@ test 'release lookup, related artists have no tags/genres' => sub { id => '3088b672-fba9-4b4b-8ae0-dce13babfbb4', name => 'Plone', 'sort-name' => 'Plone', + country => 'GB', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -1484,6 +1497,7 @@ test 'release lookup, related artists have no tags/genres' => sub { id => '3088b672-fba9-4b4b-8ae0-dce13babfbb4', name => 'Plone', 'sort-name' => 'Plone', + country => 'GB', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -1523,6 +1537,7 @@ test 'release lookup, related artists have no tags/genres' => sub { id => '3088b672-fba9-4b4b-8ae0-dce13babfbb4', name => 'Plone', 'sort-name' => 'Plone', + country => 'GB', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -1557,6 +1572,7 @@ test 'release lookup, related artists have no tags/genres' => sub { id => '3088b672-fba9-4b4b-8ae0-dce13babfbb4', name => 'Plone', 'sort-name' => 'Plone', + country => 'GB', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -1606,6 +1622,7 @@ test 'release lookup, pregap track' => sub { id => '38c5cdab-5d6d-43d1-85b0-dac41bde186e', name => 'Blind Melon', 'sort-name' => 'Blind Melon', + country => 'US', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, @@ -1725,6 +1742,7 @@ test 'MBS-7914' => sub { id => '8d610e51-64b4-4654-b8df-064b0fb7a9d9', name => 'Gustav Mahler', 'sort-name' => 'Mahler, Gustav', + country => 'AT', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', }, @@ -1767,6 +1785,7 @@ test 'MBS-7914' => sub { id => '8d610e51-64b4-4654-b8df-064b0fb7a9d9', name => 'Gustav Mahler', 'sort-name' => 'Mahler, Gustav', + country => 'AT', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', }, @@ -1796,6 +1815,7 @@ test 'MBS-7914' => sub { id => '509c772e-1164-4457-8d09-0553cfa77d64', name => 'Chicago Symphony Orchestra', 'sort-name' => 'Chicago Symphony Orchestra', + country => 'US', 'type' => 'Orchestra', 'type-id' => 'a0b36c92-3eb1-3839-a4f9-4799823f54a5', }, @@ -1849,6 +1869,7 @@ test 'tags and genres on associated entities' => sub { id => 'c369975a-7381-4afd-9c36-1d8fe5115e28', name => 'Lori Cooke', 'sort-name' => 'Cooke, Lori', + country => '', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', tags => [ @@ -1898,6 +1919,7 @@ test 'tags and genres on associated entities' => sub { id => 'c369975a-7381-4afd-9c36-1d8fe5115e28', name => 'Lori Cooke', 'sort-name' => 'Cooke, Lori', + country => '', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', }, @@ -1918,6 +1940,7 @@ test 'tags and genres on associated entities' => sub { id => '561e53a1-9ae6-4d85-95c0-a39b028eabe4', name => 'Frances Jones', 'sort-name' => 'Jones, Frances', + country => '', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', tags => [ @@ -1944,6 +1967,7 @@ test 'tags and genres on associated entities' => sub { id => '95ffd873-9901-4ebd-b07d-eb1fe4485baf', name => 'Lavone Grimm', 'sort-name' => 'Grimm, Lavone', + country => '', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', tags => [ @@ -1969,6 +1993,7 @@ test 'tags and genres on associated entities' => sub { id => 'c369975a-7381-4afd-9c36-1d8fe5115e28', name => 'Lori Cooke', 'sort-name' => 'Cooke, Lori', + country => '', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', }, @@ -1981,6 +2006,7 @@ test 'tags and genres on associated entities' => sub { id => '561e53a1-9ae6-4d85-95c0-a39b028eabe4', name => 'Frances Jones', 'sort-name' => 'Jones, Frances', + country => '', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', }, @@ -2001,6 +2027,7 @@ test 'tags and genres on associated entities' => sub { id => '9084ad69-7e81-44f9-a195-a522a9b7b08b', name => 'Leslie Rice', 'sort-name' => 'Rice, Leslie', + country => '', 'type' => 'Character', 'type-id' => '5c1375b0-f18d-3db7-a164-a49d7a63773f', tags => [ @@ -2050,6 +2077,7 @@ test 'tags and genres on associated entities' => sub { id => 'c369975a-7381-4afd-9c36-1d8fe5115e28', name => 'Lori Cooke', 'sort-name' => 'Cooke, Lori', + country => '', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', }, @@ -2070,6 +2098,7 @@ test 'tags and genres on associated entities' => sub { id => '561e53a1-9ae6-4d85-95c0-a39b028eabe4', name => 'Frances Jones', 'sort-name' => 'Jones, Frances', + country => '', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', tags => [ diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupReleaseGroup.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupReleaseGroup.pm index b09320e42dd..73349d536b1 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupReleaseGroup.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupReleaseGroup.pm @@ -117,6 +117,7 @@ test 'release group lookup with artists' => sub { name => 'Distance', 'sort-name' => 'Distance', disambiguation => 'UK dubstep artist Greg Sanders', + country => 'GB', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', }, @@ -148,6 +149,7 @@ test 'release group lookup with inc=artists+releases+tags+ratings' => sub { name => 'm-flo', 'sort-name' => 'm-flo', disambiguation => '', + country => 'JP', tags => [], 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', @@ -210,6 +212,7 @@ test 'release group lookup with pseudo-releases' => sub { name => 'm-flo', 'sort-name' => 'm-flo', disambiguation => '', + country => 'JP', 'type' => 'Group', 'type-id' => 'e431f5f6-b5d2-343d-8b36-72607fffb74b', }, diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupURL.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupURL.pm index caf66fa4ce1..d9782e1462b 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupURL.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupURL.pm @@ -43,6 +43,7 @@ test 'basic url lookup' => sub { name => 'Paul Allgood', 'sort-name' => 'Allgood, Paul', disambiguation => '', + country => 'US', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', }, From 62c4f9756cb2413deeae799bb708eb7864164535 Mon Sep 17 00:00:00 2001 From: sanojjonas7 Date: Mon, 16 Dec 2024 22:17:44 +0100 Subject: [PATCH 5/5] MBS-12170: try to fix the tests part 2b --- t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupURL.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupURL.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupURL.pm index d9782e1462b..79ebfc30c87 100644 --- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupURL.pm +++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupURL.pm @@ -43,9 +43,9 @@ test 'basic url lookup' => sub { name => 'Paul Allgood', 'sort-name' => 'Allgood, Paul', disambiguation => '', - country => 'US', 'type' => 'Person', 'type-id' => 'b6e035f4-3ce9-331c-97df-83397230b0df', + country => 'US', }, ended => JSON::false, begin => JSON::null,