diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-29 06:57:34 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-29 06:57:34 +0300 |
| commit | dfd2c741849e9afaf35e3ddbecbb50feb47f5d22 (patch) | |
| tree | 92d77142391ed6eab45a4bec792ed02be91fbe39 /test/upload_test.exs | |
| parent | edb659dc579fe56227adef0b0704ff13b6ef717e (diff) | |
| parent | 4e81b4b190161ebb0c496c682fa8e1e0c38a3903 (diff) | |
| download | pleroma-dfd2c741849e9afaf35e3ddbecbb50feb47f5d22.tar.gz pleroma-dfd2c741849e9afaf35e3ddbecbb50feb47f5d22.zip | |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/upload_test.exs')
| -rw-r--r-- | test/upload_test.exs | 4 |
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]) |