diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-24 20:32:49 +0100 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-24 20:32:49 +0100 |
| commit | 212c31c63796a21233e8decf7ce46853383286fd (patch) | |
| tree | 0cc01fbf91ddb5037d67b39f0af80737aeec51ad /test/web/pleroma_api/controllers/account_controller_test.exs | |
| parent | 64165d1df95bc3a22260dafa4584471427685864 (diff) | |
| parent | 8eebc75c152ee339bac347350266e3bc6536016b (diff) | |
| download | pleroma-212c31c63796a21233e8decf7ce46853383286fd.tar.gz pleroma-212c31c63796a21233e8decf7ce46853383286fd.zip | |
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
Diffstat (limited to 'test/web/pleroma_api/controllers/account_controller_test.exs')
| -rw-r--r-- | test/web/pleroma_api/controllers/account_controller_test.exs | 4 |
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 |