diff options
| author | lain <lain@soykaf.club> | 2020-02-20 11:36:48 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-02-20 11:36:48 +0000 |
| commit | cf4ecffcea84d9b214f922a973d50c699317a202 (patch) | |
| tree | 27eeb915193738f167db55119afb5a5ebafa9b6b /test/plugs/user_enabled_plug_test.exs | |
| parent | 3b78695c9828bc49a5c7706437af5f24fc4475de (diff) | |
| parent | 226f4d5ef93805e2ff93f00d443238ab7afeb3e6 (diff) | |
| download | pleroma-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/plugs/user_enabled_plug_test.exs')
| -rw-r--r-- | test/plugs/user_enabled_plug_test.exs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/plugs/user_enabled_plug_test.exs b/test/plugs/user_enabled_plug_test.exs index a4035bf0e..b6f297552 100644 --- a/test/plugs/user_enabled_plug_test.exs +++ b/test/plugs/user_enabled_plug_test.exs @@ -8,6 +8,8 @@ defmodule Pleroma.Plugs.UserEnabledPlugTest do alias Pleroma.Plugs.UserEnabledPlug import Pleroma.Factory + clear_config([:instance, :account_activation_required]) + test "doesn't do anything if the user isn't set", %{conn: conn} do ret_conn = conn @@ -18,7 +20,6 @@ defmodule Pleroma.Plugs.UserEnabledPlugTest do test "with a user that's not confirmed and a config requiring confirmation, it removes that user", %{conn: conn} do - old = Pleroma.Config.get([:instance, :account_activation_required]) Pleroma.Config.put([:instance, :account_activation_required], true) user = insert(:user, confirmation_pending: true) @@ -29,8 +30,6 @@ defmodule Pleroma.Plugs.UserEnabledPlugTest do |> UserEnabledPlug.call(%{}) assert conn.assigns.user == nil - - Pleroma.Config.put([:instance, :account_activation_required], old) end test "with a user that is deactivated, it removes that user", %{conn: conn} do |