diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-20 20:47:54 +0300 | 
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-20 20:47:54 +0300 | 
| commit | 9bae9b1b1bf4f48e20ce0b2d9b670648d052e069 (patch) | |
| tree | e6755e3d585d753ad7da171a858508d4a1603a49 /test/uploaders/s3_test.exs | |
| parent | 51ce0813d351cad900966aea49a6f6d17d33f964 (diff) | |
| parent | d74405fc1a27bb3d13f4ead2bc2369f23827a781 (diff) | |
| download | pleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.tar.gz pleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.zip | |
Merge branch 'develop' into gun
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 | 
