summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/instance_controller_test.exs
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-07-16 14:51:36 -0500
committerAlex Gleason <alex@alexgleason.me>2020-07-16 14:51:36 -0500
commit38425ebdbf157377ccb0402f78dc3d02f81c55f5 (patch)
tree740f32837d28e918f097c948d89827d99434d5b2 /test/web/mastodon_api/controllers/instance_controller_test.exs
parent8daacc911498d827fd68ea3d34eb1be9ae4a1ffe (diff)
parent3a2b2cb6f2d6ce39ae0d246649189c021c535992 (diff)
downloadpleroma-38425ebdbf157377ccb0402f78dc3d02f81c55f5.tar.gz
pleroma-38425ebdbf157377ccb0402f78dc3d02f81c55f5.zip
Merge remote-tracking branch 'upstream/develop' into linkify
Diffstat (limited to 'test/web/mastodon_api/controllers/instance_controller_test.exs')
-rw-r--r--test/web/mastodon_api/controllers/instance_controller_test.exs6
1 files changed, 5 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 8bdfdddd1..cc880d82c 100644
--- a/test/web/mastodon_api/controllers/instance_controller_test.exs
+++ b/test/web/mastodon_api/controllers/instance_controller_test.exs
@@ -32,11 +32,15 @@ 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
assert result["pleroma"]["metadata"]["features"]
assert result["pleroma"]["metadata"]["federation"]
+ assert result["pleroma"]["metadata"]["fields_limits"]
assert result["pleroma"]["vapid_public_key"]
assert email == from_config_email