projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'clear-config-test-improvements' into 'develop'
[akkoma]
/
test
/
web
/
mastodon_api
/
controllers
/
media_controller_test.exs
diff --git
a/test/web/mastodon_api/controllers/media_controller_test.exs
b/test/web/mastodon_api/controllers/media_controller_test.exs
index 042511ca4593e97c7703e520b998afb42e93126d..6ac4cf63b840695362bb5d440e6c80978c1778c9 100644
(file)
--- a/
test/web/mastodon_api/controllers/media_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/media_controller_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do
@@
-22,8
+22,8
@@
defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do
[image: image]
end
[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"
test "returns uploaded image", %{conn: conn, image: image} do
desc = "Description of the image"