summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/instance_controller_test.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-07-10 11:34:53 -0500
committerMark Felder <feld@FreeBSD.org>2020-07-10 11:34:53 -0500
commit3c0c1fd2efa981f18091782434c1f0ac77462b8e (patch)
tree7776233f9248d4e1caee6ad859af3a524347d926 /test/web/mastodon_api/controllers/instance_controller_test.exs
parentd7a37fddd1fc5169ae8c714d0baf8e5372a5f1d5 (diff)
parentce9514000db1e08a69b8874f21e66261b9261d86 (diff)
downloadpleroma-3c0c1fd2efa981f18091782434c1f0ac77462b8e.tar.gz
pleroma-3c0c1fd2efa981f18091782434c1f0ac77462b8e.zip
Merge branch 'develop' into issue/1790-updated-oban
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