diff options
| author | lain <lain@soykaf.club> | 2019-08-19 17:00:59 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-08-19 17:00:59 +0000 |
| commit | d2c9befc64d4b8d4f56b5e23afeb1b720767e7ff (patch) | |
| tree | cd76bb5d4cf7716624378a9cbf9cd42a63eee735 /test/upload_test.exs | |
| parent | cb222b72b39ae4dc887657d1eae03d0360cbd429 (diff) | |
| parent | e5d2c0c66949ad90f9ee02874bdea2aa94f7f683 (diff) | |
| download | pleroma-d2c9befc64d4b8d4f56b5e23afeb1b720767e7ff.tar.gz pleroma-d2c9befc64d4b8d4f56b5e23afeb1b720767e7ff.zip | |
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/upload_test.exs')
| -rw-r--r-- | test/upload_test.exs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/test/upload_test.exs b/test/upload_test.exs index 95b16078b..6721fe82e 100644 --- a/test/upload_test.exs +++ b/test/upload_test.exs @@ -250,12 +250,8 @@ defmodule Pleroma.UploadTest do end describe "Setting a custom base_url for uploaded media" do - setup do + clear_config([Pleroma.Upload, :base_url]) do Pleroma.Config.put([Pleroma.Upload, :base_url], "https://cache.pleroma.social") - - on_exit(fn -> - Pleroma.Config.put([Pleroma.Upload, :base_url], nil) - end) end test "returns a media url with configured base_url" do |