kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
Fixed broken HTML manifest regex
rodzic
ebf774d5ab
commit
cf555b8aec
|
@ -77,7 +77,7 @@ def serve_spa(request):
|
|||
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):
|
||||
|
|
|
@ -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):
|
||||
settings.FUNKWHALE_SPA_REWRITE_MANIFEST = True
|
||||
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="/")
|
||||
mocker.patch.object(middleware, "get_spa_html", return_value=spa_html)
|
||||
mocker.patch.object(
|
||||
|
@ -283,7 +285,9 @@ def test_rewrite_manifest_json_url(link, new_url, expected, mocker, settings):
|
|||
response = middleware.serve_spa(request)
|
||||
|
||||
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()
|
||||
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue