alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Consistent style

This commit is contained in:
Mark Felder 2021-01-13 12:00:48 -06:00
parent 5627f3642f
commit 94e5180846
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/pleroma/uploaders/s3_test.exs
View File

@ -12,13 +12,8 @@ defmodule Pleroma.Uploaders.S3Test do
import ExUnit.CaptureLog import ExUnit.CaptureLog
setup do setup do
clear_config(Pleroma.Upload, clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.S3)
uploader: Pleroma.Uploaders.S3 clear_config([Pleroma.Upload, :base_url], "https://s3.amazonaws.com")
)
clear_config(Pleroma.Upload,
base_url: "https://s3.amazonaws.com"
)
clear_config(Pleroma.Uploaders.S3, clear_config(Pleroma.Uploaders.S3,
bucket: "test_bucket" bucket: "test_bucket"

9
test/pleroma/user/backup_test.exs
View File

@ -195,12 +195,9 @@ test "it creates a zip archive with user data" do
describe "it uploads and deletes a backup archive" do describe "it uploads and deletes a backup archive" do
setup do setup do
clear_config(Pleroma.Uploaders.S3, clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.S3)
bucket: "test_bucket" clear_config([Pleroma.Upload, :base_url], "https://s3.amazonaws.com")
) clear_config([Pleroma.Uploaders.S3, :bucket], "test_bucket")
clear_config([Pleroma.Upload, :uploader])
clear_config([Pleroma.Upload, base_url: "https://s3.amazonaws.com"])
user = insert(:user, %{nickname: "cofe", name: "Cofe", ap_id: "http://cofe.io/users/cofe"}) user = insert(:user, %{nickname: "cofe", name: "Cofe", ap_id: "http://cofe.io/users/cofe"})