From aaaa2479dc1e10db74da6120d89fca0b3477a76a Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Sun, 21 Oct 2018 20:43:12 +0200 Subject: [PATCH] Missing changelog and getLicense endpoint for #581 --- api/funkwhale_api/subsonic/renderers.py | 2 +- api/funkwhale_api/subsonic/views.py | 2 +- api/tests/subsonic/test_renderers.py | 2 +- api/tests/subsonic/test_views.py | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/api/funkwhale_api/subsonic/renderers.py b/api/funkwhale_api/subsonic/renderers.py index fd98633aa..95b437a55 100644 --- a/api/funkwhale_api/subsonic/renderers.py +++ b/api/funkwhale_api/subsonic/renderers.py @@ -15,7 +15,7 @@ class SubsonicJSONRenderer(renderers.JSONRenderer): "status": "ok", "version": "1.16.0", "type": "funkwhale", - "funkwhale-version": funkwhale_api.__version__, + "funkwhaleVersion": funkwhale_api.__version__, } } final["subsonic-response"].update(data) diff --git a/api/funkwhale_api/subsonic/views.py b/api/funkwhale_api/subsonic/views.py index da646fcad..b8cf4b4bc 100644 --- a/api/funkwhale_api/subsonic/views.py +++ b/api/funkwhale_api/subsonic/views.py @@ -124,7 +124,7 @@ class SubsonicViewSet(viewsets.GenericViewSet): "status": "ok", "version": "1.16.0", "type": "funkwhale", - "funkwhale-version": funkwhale_api.__version__, + "funkwhaleVersion": funkwhale_api.__version__, "license": { "valid": "true", "email": "valid@valid.license", diff --git a/api/tests/subsonic/test_renderers.py b/api/tests/subsonic/test_renderers.py index e234a993a..7e977ac45 100644 --- a/api/tests/subsonic/test_renderers.py +++ b/api/tests/subsonic/test_renderers.py @@ -13,7 +13,7 @@ def test_json_renderer(): "status": "ok", "version": "1.16.0", "type": "funkwhale", - "funkwhale-version": funkwhale_api.__version__, + "funkwhaleVersion": funkwhale_api.__version__, "hello": "world", } } diff --git a/api/tests/subsonic/test_views.py b/api/tests/subsonic/test_views.py index 8d84758dc..7cf5e8f12 100644 --- a/api/tests/subsonic/test_views.py +++ b/api/tests/subsonic/test_views.py @@ -24,7 +24,7 @@ def test_render_content_json(db, api_client): "status": "ok", "version": "1.16.0", "type": "funkwhale", - "funkwhale-version": funkwhale_api.__version__, + "funkwhaleVersion": funkwhale_api.__version__, } assert response.status_code == 200 assert json.loads(response.content) == render_json(expected) @@ -60,6 +60,8 @@ def test_get_license(f, db, logged_in_api_client, mocker): expected = { "status": "ok", "version": "1.16.0", + "type": "funkwhale", + "funkwhaleVersion": funkwhale_api.__version__, "license": { "valid": "true", "email": "valid@valid.license",