diff options
| author | feld <feld@feld.me> | 2021-01-12 20:54:30 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-01-12 20:54:30 +0000 |
| commit | 5453038ce92597fe2d26cb843d48e9aa660d1ee9 (patch) | |
| tree | aadb7dc418e9ff5247cfdb80e3e2083718501841 /test | |
| parent | 100e34b4a1bade7c1a1768a7831a1be726187106 (diff) | |
| parent | ef59d998338551f15b7fe782641bfbf443fd66f4 (diff) | |
| download | pleroma-5453038ce92597fe2d26cb843d48e9aa660d1ee9.tar.gz pleroma-5453038ce92597fe2d26cb843d48e9aa660d1ee9.zip | |
Merge branch 'fix/backup-url-on-s3' into 'develop'
Standardize base url for uploads
See merge request pleroma/pleroma!3246
Diffstat (limited to 'test')
| -rw-r--r-- | test/pleroma/uploaders/s3_test.exs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/test/pleroma/uploaders/s3_test.exs b/test/pleroma/uploaders/s3_test.exs index e7a013dd8..344cf7abe 100644 --- a/test/pleroma/uploaders/s3_test.exs +++ b/test/pleroma/uploaders/s3_test.exs @@ -11,11 +11,16 @@ defmodule Pleroma.Uploaders.S3Test do import Mock import ExUnit.CaptureLog - setup do: - clear_config(Pleroma.Uploaders.S3, - bucket: "test_bucket", - public_endpoint: "https://s3.amazonaws.com" - ) + setup do + clear_config(Pleroma.Upload, + uploader: Pleroma.Uploaders.S3 + ) + + clear_config(Pleroma.Uploaders.S3, + bucket: "test_bucket", + public_endpoint: "https://s3.amazonaws.com" + ) + end describe "get_file/1" do test "it returns path to local folder for files" do |