summaryrefslogtreecommitdiff
path: root/test/upload_test.exs
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-20 20:47:54 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-20 20:47:54 +0300
commit9bae9b1b1bf4f48e20ce0b2d9b670648d052e069 (patch)
treee6755e3d585d753ad7da171a858508d4a1603a49 /test/upload_test.exs
parent51ce0813d351cad900966aea49a6f6d17d33f964 (diff)
parentd74405fc1a27bb3d13f4ead2bc2369f23827a781 (diff)
downloadpleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.tar.gz
pleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.zip
Merge branch 'develop' into gun
Diffstat (limited to 'test/upload_test.exs')
-rw-r--r--test/upload_test.exs4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/upload_test.exs b/test/upload_test.exs
index 6ce42b630..060a940bb 100644
--- a/test/upload_test.exs
+++ b/test/upload_test.exs
@@ -250,9 +250,7 @@ defmodule Pleroma.UploadTest do
end
describe "Setting a custom base_url for uploaded media" do
- clear_config([Pleroma.Upload, :base_url]) do
- Pleroma.Config.put([Pleroma.Upload, :base_url], "https://cache.pleroma.social")
- end
+ setup do: clear_config([Pleroma.Upload, :base_url], "https://cache.pleroma.social")
test "returns a media url with configured base_url" do
base_url = Pleroma.Config.get([Pleroma.Upload, :base_url])