aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2021-01-13 12:00:48 -0600
committerMark Felder <feld@feld.me>2021-01-13 12:00:48 -0600
commit94e51808461cd5a6148c6782159fa3f0ecc14638 (patch)
tree3321a2daae5c043991b2c4ece0ae74d3adf47166 /test
parent5627f3642fd96b678bdd5c3b9f3da0dbb038d75c (diff)
downloadpleroma-94e51808461cd5a6148c6782159fa3f0ecc14638.tar.gz
Consistent style
Diffstat (limited to 'test')
-rw-r--r--test/pleroma/uploaders/s3_test.exs9
-rw-r--r--test/pleroma/user/backup_test.exs9
2 files changed, 5 insertions, 13 deletions
diff --git a/test/pleroma/uploaders/s3_test.exs b/test/pleroma/uploaders/s3_test.exs
index f399f8ae5..da3a57163 100644
--- a/test/pleroma/uploaders/s3_test.exs
+++ b/test/pleroma/uploaders/s3_test.exs
@@ -12,13 +12,8 @@ defmodule Pleroma.Uploaders.S3Test do
import ExUnit.CaptureLog
setup do
- clear_config(Pleroma.Upload,
- uploader: Pleroma.Uploaders.S3
- )
-
- clear_config(Pleroma.Upload,
- base_url: "https://s3.amazonaws.com"
- )
+ clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.S3)
+ clear_config([Pleroma.Upload, :base_url], "https://s3.amazonaws.com")
clear_config(Pleroma.Uploaders.S3,
bucket: "test_bucket"
diff --git a/test/pleroma/user/backup_test.exs b/test/pleroma/user/backup_test.exs
index 01a1ed962..64a92cb7d 100644
--- a/test/pleroma/user/backup_test.exs
+++ b/test/pleroma/user/backup_test.exs
@@ -195,12 +195,9 @@ defmodule Pleroma.User.BackupTest do
describe "it uploads and deletes a backup archive" do
setup do
- clear_config(Pleroma.Uploaders.S3,
- bucket: "test_bucket"
- )
-
- clear_config([Pleroma.Upload, :uploader])
- clear_config([Pleroma.Upload, base_url: "https://s3.amazonaws.com"])
+ clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.S3)
+ clear_config([Pleroma.Upload, :base_url], "https://s3.amazonaws.com")
+ clear_config([Pleroma.Uploaders.S3, :bucket], "test_bucket")
user = insert(:user, %{nickname: "cofe", name: "Cofe", ap_id: "http://cofe.io/users/cofe"})