Skip to content
Snippets Groups Projects
Verified Commit cf555b8a authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Fixed broken HTML manifest regex

parent ebf774d5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
api/funkwhale_api/common/middleware.py
+ 1
− 1
View file @ cf555b8a
...@@ -77,7 +77,7 @@ def serve_spa(request): ...@@ -77,7 +77,7 @@ def serve_spa(request):
return http.HttpResponse(head + tail) return http.HttpResponse(head + tail)
MANIFEST_LINK_REGEX = re.compile(r"<link .*rel=(?:'|\")?manifest(?:'|\")?.*>") MANIFEST_LINK_REGEX = re.compile(r"<link [^>]*rel=(?:'|\")?manifest(?:'|\")?[^>]*>")
def replace_manifest_url(head, new_url): def replace_manifest_url(head, new_url):
......
api/tests/common/test_middleware.py
+ 6
− 2
View file @ cf555b8a
...@@ -274,7 +274,9 @@ def test_throttle_status_middleware_returns_proper_response(mocker): ...@@ -274,7 +274,9 @@ def test_throttle_status_middleware_returns_proper_response(mocker):
def test_rewrite_manifest_json_url(link, new_url, expected, mocker, settings): def test_rewrite_manifest_json_url(link, new_url, expected, mocker, settings):
settings.FUNKWHALE_SPA_REWRITE_MANIFEST = True settings.FUNKWHALE_SPA_REWRITE_MANIFEST = True
settings.FUNKWHALE_SPA_REWRITE_MANIFEST_URL = new_url settings.FUNKWHALE_SPA_REWRITE_MANIFEST_URL = new_url
spa_html = "<html><head>{}</head></html>".format(link) spa_html = "<html><head><link rel=before>{}<link rel=after></head></html>".format(
link
)
request = mocker.Mock(path="/") request = mocker.Mock(path="/")
mocker.patch.object(middleware, "get_spa_html", return_value=spa_html) mocker.patch.object(middleware, "get_spa_html", return_value=spa_html)
mocker.patch.object( mocker.patch.object(
...@@ -283,7 +285,9 @@ def test_rewrite_manifest_json_url(link, new_url, expected, mocker, settings): ...@@ -283,7 +285,9 @@ def test_rewrite_manifest_json_url(link, new_url, expected, mocker, settings):
response = middleware.serve_spa(request) response = middleware.serve_spa(request)
assert response.status_code == 200 assert response.status_code == 200
expected_html = "<html><head>{}\n\n</head></html>".format(expected) expected_html = "<html><head><link rel=before>{}<link rel=after>\n\n</head></html>".format(
expected
)
assert response.content == expected_html.encode() assert response.content == expected_html.encode()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment