Verified Commit ce4a6b04 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Fix #851: wrong og:image url when using S3 storage

parent 9ae2c490
......@@ -113,6 +113,9 @@ def chunk_queryset(source_qs, chunk_size):
def join_url(start, end):
if end.startswith("http://") or end.startswith("https://"):
# alread a full URL, joining makes no sense
return end
if start.endswith("/") and end.startswith("/"):
return start + end[1:]
......@@ -85,3 +85,17 @@ def test_get_updated_fields(conf, mock_args, data, expected, mocker):
obj = mocker.Mock(**mock_args)
assert utils.get_updated_fields(conf, data, obj) == expected
"start, end, expected",
("https://domain", "/api", "https://domain/api"),
("https://domain/", "/api", "https://domain/api"),
("https://domain", "api", "https://domain/api"),
("https://domain", "https://api", "https://api"),
("https://domain", "http://api", "http://api"),
def test_join_url(start, end, expected):
assert utils.join_url(start, end) == expected
Fixed wrong og:image url when using S3 storage (#851)
Supports Markdown
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