summaryrefslogtreecommitdiff
path: root/test/web/oauth/oauth_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-02-20 11:36:48 +0000
committerlain <lain@soykaf.club>2020-02-20 11:36:48 +0000
commitcf4ecffcea84d9b214f922a973d50c699317a202 (patch)
tree27eeb915193738f167db55119afb5a5ebafa9b6b /test/web/oauth/oauth_controller_test.exs
parent3b78695c9828bc49a5c7706437af5f24fc4475de (diff)
parent226f4d5ef93805e2ff93f00d443238ab7afeb3e6 (diff)
downloadpleroma-cf4ecffcea84d9b214f922a973d50c699317a202.tar.gz
pleroma-cf4ecffcea84d9b214f922a973d50c699317a202.zip
Merge branch 'tests-clear-config-tweaks' into 'develop'
Tweaks to `clear_config` calls in tests See merge request pleroma/pleroma!2209
Diffstat (limited to 'test/web/oauth/oauth_controller_test.exs')
-rw-r--r--test/web/oauth/oauth_controller_test.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/oauth/oauth_controller_test.exs b/test/web/oauth/oauth_controller_test.exs
index adeff8e25..89fcf8c36 100644
--- a/test/web/oauth/oauth_controller_test.exs
+++ b/test/web/oauth/oauth_controller_test.exs
@@ -17,7 +17,8 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
key: "_test",
signing_salt: "cooldude"
]
- clear_config_all([:instance, :account_activation_required])
+
+ clear_config([:instance, :account_activation_required])
describe "in OAuth consumer mode, " do
setup do