summaryrefslogtreecommitdiff
path: root/test/web/pleroma_api/controllers/account_controller_test.exs
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-20 20:47:54 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-20 20:47:54 +0300
commit9bae9b1b1bf4f48e20ce0b2d9b670648d052e069 (patch)
treee6755e3d585d753ad7da171a858508d4a1603a49 /test/web/pleroma_api/controllers/account_controller_test.exs
parent51ce0813d351cad900966aea49a6f6d17d33f964 (diff)
parentd74405fc1a27bb3d13f4ead2bc2369f23827a781 (diff)
downloadpleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.tar.gz
pleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.zip
Merge branch 'develop' into gun
Diffstat (limited to 'test/web/pleroma_api/controllers/account_controller_test.exs')
-rw-r--r--test/web/pleroma_api/controllers/account_controller_test.exs4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/web/pleroma_api/controllers/account_controller_test.exs b/test/web/pleroma_api/controllers/account_controller_test.exs
index 245cc1579..2aa87ac30 100644
--- a/test/web/pleroma_api/controllers/account_controller_test.exs
+++ b/test/web/pleroma_api/controllers/account_controller_test.exs
@@ -27,9 +27,7 @@ defmodule Pleroma.Web.PleromaAPI.AccountControllerTest do
[user: user]
end
- clear_config([:instance, :account_activation_required]) do
- Config.put([:instance, :account_activation_required], true)
- end
+ setup do: clear_config([:instance, :account_activation_required], true)
test "resend account confirmation email", %{conn: conn, user: user} do
conn