projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
[akkoma]
/
test
/
pleroma
/
web
/
plugs
/
user_enabled_plug_test.exs
diff --git
a/test/pleroma/web/plugs/user_enabled_plug_test.exs
b/test/pleroma/web/plugs/user_enabled_plug_test.exs
index e9c9e5f3e0e4366a3e357690c48b58847a410365..999c6c49c2bd6be05f5cc9a3d6db1750c2ceb12c 100644
(file)
--- a/
test/pleroma/web/plugs/user_enabled_plug_test.exs
+++ b/
test/pleroma/web/plugs/user_enabled_plug_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Plugs.UserEnabledPlugTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Plugs.UserEnabledPlugTest do
@@
-20,9
+20,9
@@
defmodule Pleroma.Web.Plugs.UserEnabledPlugTest do
test "with a user that's not confirmed and a config requiring confirmation, it removes that user",
%{conn: conn} do
test "with a user that's not confirmed and a config requiring confirmation, it removes that user",
%{conn: conn} do
-
Pleroma.Config.put
([:instance, :account_activation_required], true)
+
clear_config
([:instance, :account_activation_required], true)
- user = insert(:user,
confirmation_pending: tru
e)
+ user = insert(:user,
is_confirmed: fals
e)
conn =
conn
conn =
conn
@@
-33,7
+33,7
@@
defmodule Pleroma.Web.Plugs.UserEnabledPlugTest do
end
test "with a user that is deactivated, it removes that user", %{conn: conn} do
end
test "with a user that is deactivated, it removes that user", %{conn: conn} do
- user = insert(:user,
deactivated: tru
e)
+ user = insert(:user,
is_active: fals
e)
conn =
conn
conn =
conn