summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/instance_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-10 12:26:53 +0200
committerlain <lain@soykaf.club>2020-07-10 12:26:53 +0200
commitb39eb6ecc573c310801fe49f35d92246ddcb6226 (patch)
tree32b20b5a0ec3f5c8d44f1157087868adfaa549b0 /test/web/mastodon_api/controllers/instance_controller_test.exs
parent208baf157ad0c8be470566d5d51d0214c229e6a5 (diff)
parent8aa7143f464562ca2a0572087c526f26d1a3b7ef (diff)
downloadpleroma-b39eb6ecc573c310801fe49f35d92246ddcb6226.tar.gz
pleroma-b39eb6ecc573c310801fe49f35d92246ddcb6226.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
Diffstat (limited to 'test/web/mastodon_api/controllers/instance_controller_test.exs')
-rw-r--r--test/web/mastodon_api/controllers/instance_controller_test.exs4
1 files changed, 3 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 95ee26416..cc880d82c 100644
--- a/test/web/mastodon_api/controllers/instance_controller_test.exs
+++ b/test/web/mastodon_api/controllers/instance_controller_test.exs
@@ -32,7 +32,9 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
"avatar_upload_limit" => _,
"background_upload_limit" => _,
"banner_upload_limit" => _,
- "background_image" => _
+ "background_image" => _,
+ "chat_limit" => _,
+ "description_limit" => _
} = result
assert result["pleroma"]["metadata"]["account_activation_required"] != nil