summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/instance_controller_test.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-07-09 09:08:59 -0500
committerMark Felder <feld@FreeBSD.org>2020-07-09 09:08:59 -0500
commit49c4e2495357797caa82b4eb0a4d03e8c8dd2730 (patch)
tree7295ba98c7833534622a9c7fb27580691fbc06a5 /test/web/mastodon_api/controllers/instance_controller_test.exs
parentda4029391d217b1e2c151e69479de42e2221e02f (diff)
parent8ca1f3e8c61b906387e9cb6fb8993d2ad496ab3d (diff)
downloadpleroma-49c4e2495357797caa82b4eb0a4d03e8c8dd2730.tar.gz
pleroma-49c4e2495357797caa82b4eb0a4d03e8c8dd2730.zip
Merge branch 'develop' into fix/csp-for-captcha
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