hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix tests relying on old behavior. Use the Upload.base_url, Luke.

Browse source
This commit is contained in:
Mark Felder 2021-01-12 16:35:10 -06:00
commit e87cca97e6
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
test/pleroma/uploaders/s3_test.exs
View file

@ -16,9 +16,12 @@ defmodule Pleroma.Uploaders.S3Test do
uploader: Pleroma.Uploaders.S3
)
clear_config(Pleroma.Upload,
base_url: "https://s3.amazonaws.com"
)
clear_config(Pleroma.Uploaders.S3,
bucket: "test_bucket",
public_endpoint: "https://s3.amazonaws.com"
bucket: "test_bucket"
)
end
@ -33,10 +36,11 @@ defmodule Pleroma.Uploaders.S3Test do
test "it returns path without bucket when truncated_namespace set to ''" do
Config.put([Pleroma.Uploaders.S3],
bucket: "test_bucket",
public_endpoint: "https://s3.amazonaws.com",
truncated_namespace: ""
)
Config.put([Pleroma.Upload], base_url: "https://s3.amazonaws.com")
assert S3.get_file("test_image.jpg") == {
:ok,
{:url, "https://s3.amazonaws.com/test_image.jpg"}
@ -46,10 +50,11 @@ defmodule Pleroma.Uploaders.S3Test do
test "it returns path with bucket namespace when namespace is set" do
Config.put([Pleroma.Uploaders.S3],
bucket: "test_bucket",
public_endpoint: "https://s3.amazonaws.com",
bucket_namespace: "family"
)
Config.put([Pleroma.Upload], base_url: "https://s3.amazonaws.com")
assert S3.get_file("test_image.jpg") == {
:ok,
{:url, "https://s3.amazonaws.com/family:test_bucket/test_image.jpg"}