summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-08-22 21:13:03 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-08-22 21:13:03 +0300
commitf95b67c9339466767cd8ce9f3e05493ed3127408 (patch)
tree723e77c3c780142f29f91c1ce1909135a57c0352 /test/web/mastodon_api
parent64bfb41c553a45855e86737298185c1395bbb350 (diff)
parent0e50e9e4fa5a5d33d36f4226e1d32a00bf53fc72 (diff)
downloadpleroma-f95b67c9339466767cd8ce9f3e05493ed3127408.tar.gz
pleroma-f95b67c9339466767cd8ce9f3e05493ed3127408.zip
Merge branch 'develop' into issue/1177
Diffstat (limited to 'test/web/mastodon_api')
-rw-r--r--test/web/mastodon_api/mastodon_api_controller/update_credentials_test.exs1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller/update_credentials_test.exs b/test/web/mastodon_api/mastodon_api_controller/update_credentials_test.exs
index dd443495b..87ee82050 100644
--- a/test/web/mastodon_api/mastodon_api_controller/update_credentials_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller/update_credentials_test.exs
@@ -9,6 +9,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do
use Pleroma.Web.ConnCase
import Pleroma.Factory
+ clear_config([:instance, :max_account_fields])
describe "updating credentials" do
test "sets user settings in a generic way", %{conn: conn} do