aboutsummaryrefslogtreecommitdiff
path: root/test/web/mastodon_api
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-05-20 10:53:54 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-05-20 10:53:54 +0000
commit94ba5a780212920a1d4b303c3523f66ca0147a67 (patch)
treea64b6c0dc26b6c5bd5ba388dd0bf5edbeacddbd3 /test/web/mastodon_api
parent6dd1575c64ccc2ffe82155f70935b2aa58d22684 (diff)
parent2a74565090ebd7107e1419b4a56f6c6aa4a06ea1 (diff)
downloadpleroma-94ba5a780212920a1d4b303c3523f66ca0147a67.tar.gz
Merge branch 'exposed-background-image' into 'develop'
InstanceView: Expose background image link. See merge request pleroma/pleroma!2545
Diffstat (limited to 'test/web/mastodon_api')
-rw-r--r--test/web/mastodon_api/controllers/instance_controller_test.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/mastodon_api/controllers/instance_controller_test.exs b/test/web/mastodon_api/controllers/instance_controller_test.exs
index 2c61dc5ba..8bdfdddd1 100644
--- a/test/web/mastodon_api/controllers/instance_controller_test.exs
+++ b/test/web/mastodon_api/controllers/instance_controller_test.exs
@@ -31,7 +31,8 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
"upload_limit" => _,
"avatar_upload_limit" => _,
"background_upload_limit" => _,
- "banner_upload_limit" => _
+ "banner_upload_limit" => _,
+ "background_image" => _
} = result
assert result["pleroma"]["metadata"]["features"]