diff options
| author | lain <lain@soykaf.club> | 2020-04-06 17:50:31 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-06 17:50:31 +0200 |
| commit | 19335be24c25739e2334180af6c59dd8919d5fc8 (patch) | |
| tree | db34531b2dd5befb495d4379aa8aaad9284fa72c /test/web/mastodon_api/controllers/media_controller_test.exs | |
| parent | fd97b0e634d30dec3217efcf3d67610d1b54bf8b (diff) | |
| parent | 1d4ab06505ec5143dbb1d78d718fa9efd1497751 (diff) | |
| download | pleroma-19335be24c25739e2334180af6c59dd8919d5fc8.tar.gz pleroma-19335be24c25739e2334180af6c59dd8919d5fc8.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'test/web/mastodon_api/controllers/media_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/media_controller_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/mastodon_api/controllers/media_controller_test.exs b/test/web/mastodon_api/controllers/media_controller_test.exs index 203fa73b0..6ac4cf63b 100644 --- a/test/web/mastodon_api/controllers/media_controller_test.exs +++ b/test/web/mastodon_api/controllers/media_controller_test.exs @@ -22,8 +22,8 @@ defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do [image: image] end - clear_config([:media_proxy]) - clear_config([Pleroma.Upload]) + setup do: clear_config([:media_proxy]) + setup do: clear_config([Pleroma.Upload]) test "returns uploaded image", %{conn: conn, image: image} do desc = "Description of the image" |