From b696c3bb9f7eda51021b0bdb7cbb51835a5fb3ea Mon Sep 17 00:00:00 2001
From: Petitminion <petitminion@riseup.net>
Date: Thu, 29 Feb 2024 15:34:21 +0100
Subject: [PATCH] rebase and some test update

---
 .env.dev                            |  2 +-
 api/config/settings/common.py       |  2 +-
 api/config/urls/api_v2.py           |  2 +-
 api/tests/playlists/test_urls_v2.py | 20 ++++++++------------
 dev.yml                             |  2 +-
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.env.dev b/.env.dev
index d041167ba..d8d769195 100644
--- a/.env.dev
+++ b/.env.dev
@@ -18,6 +18,6 @@ MEDIA_ROOT=/data/media
 # FORCE_HTTPS_URLS=True
 
 # Customize to your needs
-POSTGRES_VERSION=11
+POSTGRES_VERSION=12
 DEBUG=true
 TYPESENSE_API_KEY="apikey"
diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index dcd0e6ba6..13ca7f60e 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -2,7 +2,7 @@ import logging.config
 import sys
 import warnings
 from collections import OrderedDict
-from urllib.parse import urlsplit
+from urllib.parse import urlsplit, urlparse
 from . import testing
 
 import environ
diff --git a/api/config/urls/api_v2.py b/api/config/urls/api_v2.py
index 072dcfa69..cbf0425cb 100644
--- a/api/config/urls/api_v2.py
+++ b/api/config/urls/api_v2.py
@@ -15,7 +15,7 @@ v2_patterns += [
         r"^radios/",
         include(("funkwhale_api.radios.urls_v2", "radios"), namespace="radios"),
     ),
-    url(
+    re_path(
         r"^",
         include(
             ("funkwhale_api.playlists.urls_v2", "playlists"), namespace="playlists"
diff --git a/api/tests/playlists/test_urls_v2.py b/api/tests/playlists/test_urls_v2.py
index e28697bb5..8c2656c1c 100644
--- a/api/tests/playlists/test_urls_v2.py
+++ b/api/tests/playlists/test_urls_v2.py
@@ -31,6 +31,14 @@ def test_can_get_playlists_octet_stream(factories, logged_in_api_client):
     assert el.findtext("./title") == pl.name
 
 
+def test_can_get_playlists_json(factories, logged_in_api_client):
+    pl = factories["playlists.Playlist"]()
+    url = reverse("api:v2:playlists:playlists-detail", kwargs={"pk": pl.pk})
+    response = logged_in_api_client.get(url, format="json")
+    assert response.status_code == 200
+    assert response.data["name"] == pl.name
+
+
 def test_can_get_user_playlists_list(factories, logged_in_api_client):
     user = factories["users.User"]()
     factories["playlists.Playlist"](user=user)
@@ -81,18 +89,6 @@ def test_can_patch_playlists_octet_stream(factories, logged_in_api_client):
     assert pl.playlist_tracks.all()[0].track.title == track.title
 
 
-def test_can_get_playlists_id(factories, logged_in_api_client):
-    pl = factories["playlists.Playlist"]()
-    url = reverse("api:v2:playlists:playlists-detail", kwargs={"pk": pl.pk})
-    headers = {"Content-Type": "application/json"}
-
-    response = logged_in_api_client.get(url, headers=headers, format="json")
-    assert response.status_code == 200
-    assert (
-        etree.fromstring(response.content.decode("utf-8")).findtext("title") == pl.name
-    )
-
-
 def test_can_get_playlists_track(factories, logged_in_api_client):
     pl = factories["playlists.Playlist"]()
     plt = factories["playlists.PlaylistTrack"](playlist=pl)
diff --git a/dev.yml b/dev.yml
index 9ba73c6d2..1e94d3652 100644
--- a/dev.yml
+++ b/dev.yml
@@ -25,7 +25,7 @@ services:
     env_file:
       - .env.dev
       - .env
-    image: postgres:${POSTGRES_VERSION-11}-alpine
+    image: postgres:${POSTGRES_VERSION-12}-alpine
     environment:
       - "POSTGRES_HOST_AUTH_METHOD=trust"
     command: postgres ${POSTGRES_ARGS-}