diff options
| author | lain <lain@soykaf.club> | 2020-07-27 16:35:47 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-27 16:35:47 +0000 |
| commit | e1a1c8e7de5e10fa64d168dc5d35a80b96767395 (patch) | |
| tree | c0057448e323c730bea2c76cecf9efb85ef14181 /test/web/mastodon_api/controllers/instance_controller_test.exs | |
| parent | 4a6389316dac53c1ca2ec36d160690476d881185 (diff) | |
| parent | 2a3abfd326f0cbb588dfe66a23e9783be3038a5e (diff) | |
| download | pleroma-e1a1c8e7de5e10fa64d168dc5d35a80b96767395.tar.gz pleroma-e1a1c8e7de5e10fa64d168dc5d35a80b96767395.zip | |
Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
# Conflicts:
# lib/pleroma/web/views/masto_fe_view.ex
Diffstat (limited to 'test/web/mastodon_api/controllers/instance_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/instance_controller_test.exs | 6 |
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 |