diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-20 22:08:34 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-20 22:08:34 +0400 |
| commit | 80e15716102e03323b117ade919035402cc7408f (patch) | |
| tree | 60b57dde12b4feb693a6383b71f813561a48a928 /test/uploaders/s3_test.exs | |
| parent | 5ad54d1bd556f3dc957aa1d2ebe6314618e75399 (diff) | |
| parent | d74405fc1a27bb3d13f4ead2bc2369f23827a781 (diff) | |
| download | pleroma-80e15716102e03323b117ade919035402cc7408f.tar.gz pleroma-80e15716102e03323b117ade919035402cc7408f.zip | |
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'test/uploaders/s3_test.exs')
| -rw-r--r-- | test/uploaders/s3_test.exs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/test/uploaders/s3_test.exs b/test/uploaders/s3_test.exs index fdc7eff41..6950ccb25 100644 --- a/test/uploaders/s3_test.exs +++ b/test/uploaders/s3_test.exs @@ -11,12 +11,11 @@ defmodule Pleroma.Uploaders.S3Test do import Mock import ExUnit.CaptureLog - clear_config([Pleroma.Uploaders.S3]) do - Config.put([Pleroma.Uploaders.S3], - bucket: "test_bucket", - public_endpoint: "https://s3.amazonaws.com" - ) - end + setup do: + clear_config(Pleroma.Uploaders.S3, + bucket: "test_bucket", + public_endpoint: "https://s3.amazonaws.com" + ) describe "get_file/1" do test "it returns path to local folder for files" do |