summaryrefslogtreecommitdiff
path: root/test/uploaders/s3_test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-03-29 06:57:34 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-03-29 06:57:34 +0300
commitdfd2c741849e9afaf35e3ddbecbb50feb47f5d22 (patch)
tree92d77142391ed6eab45a4bec792ed02be91fbe39 /test/uploaders/s3_test.exs
parentedb659dc579fe56227adef0b0704ff13b6ef717e (diff)
parent4e81b4b190161ebb0c496c682fa8e1e0c38a3903 (diff)
downloadpleroma-dfd2c741849e9afaf35e3ddbecbb50feb47f5d22.tar.gz
pleroma-dfd2c741849e9afaf35e3ddbecbb50feb47f5d22.zip
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/uploaders/s3_test.exs')
-rw-r--r--test/uploaders/s3_test.exs11
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