projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove toggle_confirmation; require explicit state change
[akkoma]
/
test
/
pleroma
/
user_test.exs
diff --git
a/test/pleroma/user_test.exs
b/test/pleroma/user_test.exs
index 40bbcad0bfb88ad1090da955d098851dced1ebfb..ac9db9ffb53ffd62b4477ec0c0a1a0a70db35635 100644
(file)
--- a/
test/pleroma/user_test.exs
+++ b/
test/pleroma/user_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.UserTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.UserTest do
@@
-438,7
+438,7
@@
defmodule Pleroma.UserTest do
activity = Repo.one(Pleroma.Activity)
assert registered_user.ap_id in activity.recipients
activity = Repo.one(Pleroma.Activity)
assert registered_user.ap_id in activity.recipients
- assert Object.normalize(activity).data["content"] =~ "direct message"
+ assert Object.normalize(activity
, fetch: false
).data["content"] =~ "direct message"
assert activity.actor == welcome_user.ap_id
end
assert activity.actor == welcome_user.ap_id
end
@@
-454,7
+454,7
@@
defmodule Pleroma.UserTest do
activity = Repo.one(Pleroma.Activity)
assert registered_user.ap_id in activity.recipients
activity = Repo.one(Pleroma.Activity)
assert registered_user.ap_id in activity.recipients
- assert Object.normalize(activity).data["content"] =~ "chat message"
+ assert Object.normalize(activity
, fetch: false
).data["content"] =~ "chat message"
assert activity.actor == welcome_user.ap_id
end
assert activity.actor == welcome_user.ap_id
end
@@
-493,7
+493,7
@@
defmodule Pleroma.UserTest do
activity = Repo.one(Pleroma.Activity)
assert registered_user.ap_id in activity.recipients
activity = Repo.one(Pleroma.Activity)
assert registered_user.ap_id in activity.recipients
- assert Object.normalize(activity).data["content"] =~ "chat message"
+ assert Object.normalize(activity
, fetch: false
).data["content"] =~ "chat message"
assert activity.actor == welcome_user.ap_id
end
assert activity.actor == welcome_user.ap_id
end
@@
-640,7
+640,7
@@
defmodule Pleroma.UserTest do
{:ok, user} = Repo.insert(changeset)
{:ok, user} = Repo.insert(changeset)
- refute user.confirmation_pending
+ assert user.is_confirmed
end
end
end
end
@@
-661,17
+661,17
@@
defmodule Pleroma.UserTest do
{:ok, user} = Repo.insert(changeset)
{:ok, user} = Repo.insert(changeset)
- assert user.confirmation_pending
+ refute user.is_confirmed
assert user.confirmation_token
end
test "it creates confirmed user if :confirmed option is given" do
assert user.confirmation_token
end
test "it creates confirmed user if :confirmed option is given" do
- changeset = User.register_changeset(%User{}, @full_user_data,
need_confirmation: fals
e)
+ changeset = User.register_changeset(%User{}, @full_user_data,
confirmed: tru
e)
assert changeset.valid?
{:ok, user} = Repo.insert(changeset)
assert changeset.valid?
{:ok, user} = Repo.insert(changeset)
- refute user.confirmation_pending
+ assert user.is_confirmed
refute user.confirmation_token
end
end
refute user.confirmation_token
end
end
@@
-1443,17
+1443,17
@@
defmodule Pleroma.UserTest do
describe "confirm" do
test "confirms a user" do
describe "confirm" do
test "confirms a user" do
- user = insert(:user,
confirmation_pending: tru
e)
- assert true == user.confirmation_pending
+ user = insert(:user,
is_confirmed: fals
e)
+ refute user.is_confirmed
{:ok, user} = User.confirm(user)
{:ok, user} = User.confirm(user)
- assert
false == user.confirmation_pending
+ assert
user.is_confirmed
end
test "confirms a list of users" do
unconfirmed_users = [
end
test "confirms a list of users" do
unconfirmed_users = [
- insert(:user,
confirmation_pending: tru
e),
- insert(:user,
confirmation_pending: tru
e),
- insert(:user,
confirmation_pending: tru
e)
+ insert(:user,
is_confirmed: fals
e),
+ insert(:user,
is_confirmed: fals
e),
+ insert(:user,
is_confirmed: fals
e)
]
{:ok, users} = User.confirm(unconfirmed_users)
]
{:ok, users} = User.confirm(unconfirmed_users)
@@
-1461,13
+1461,13
@@
defmodule Pleroma.UserTest do
assert Enum.count(users) == 3
Enum.each(users, fn user ->
assert Enum.count(users) == 3
Enum.each(users, fn user ->
- assert
false == user.confirmation_pending
+ assert
user.is_confirmed
end)
end
test "sends approval emails when `approval_pending: true`" do
admin = insert(:user, is_admin: true)
end)
end
test "sends approval emails when `approval_pending: true`" do
admin = insert(:user, is_admin: true)
- user = insert(:user,
confirmation_pending: tru
e, approval_pending: true)
+ user = insert(:user,
is_confirmed: fals
e, approval_pending: true)
User.confirm(user)
ObanHelpers.perform_all()
User.confirm(user)
ObanHelpers.perform_all()
@@
-1494,7
+1494,7
@@
defmodule Pleroma.UserTest do
end
test "confirming a confirmed user does not trigger post-register actions" do
end
test "confirming a confirmed user does not trigger post-register actions" do
- user = insert(:user,
confirmation_pending: fals
e, approval_pending: true)
+ user = insert(:user,
is_confirmed: tru
e, approval_pending: true)
User.confirm(user)
ObanHelpers.perform_all()
User.confirm(user)
ObanHelpers.perform_all()
@@
-1565,7
+1565,7
@@
defmodule Pleroma.UserTest do
describe "delete/1 when confirmation is pending" do
setup do
describe "delete/1 when confirmation is pending" do
setup do
- user = insert(:user,
confirmation_pending: tru
e)
+ user = insert(:user,
is_confirmed: fals
e)
{:ok, user: user}
end
{:ok, user: user}
end
@@
-1616,7
+1616,7
@@
defmodule Pleroma.UserTest do
follower_count: 9,
following_count: 9001,
is_locked: true,
follower_count: 9,
following_count: 9001,
is_locked: true,
-
confirmation_pending: tru
e,
+
is_confirmed: fals
e,
password_reset_pending: true,
approval_pending: true,
registration_reason: "ahhhhh",
password_reset_pending: true,
approval_pending: true,
registration_reason: "ahhhhh",
@@
-1658,7
+1658,7
@@
defmodule Pleroma.UserTest do
follower_count: 0,
following_count: 0,
is_locked: false,
follower_count: 0,
following_count: 0,
is_locked: false,
-
confirmation_pending: fals
e,
+
is_confirmed: tru
e,
password_reset_pending: false,
approval_pending: false,
registration_reason: nil,
password_reset_pending: false,
approval_pending: false,
registration_reason: nil,
@@
-1729,13
+1729,13
@@
defmodule Pleroma.UserTest do
test "return confirmation_pending for unconfirm user" do
Pleroma.Config.put([:instance, :account_activation_required], true)
test "return confirmation_pending for unconfirm user" do
Pleroma.Config.put([:instance, :account_activation_required], true)
- user = insert(:user,
confirmation_pending: tru
e)
+ user = insert(:user,
is_confirmed: fals
e)
assert User.account_status(user) == :confirmation_pending
end
test "return active for confirmed user" do
Pleroma.Config.put([:instance, :account_activation_required], true)
assert User.account_status(user) == :confirmation_pending
end
test "return active for confirmed user" do
Pleroma.Config.put([:instance, :account_activation_required], true)
- user = insert(:user,
confirmation_pending: fals
e)
+ user = insert(:user,
is_confirmed: tru
e)
assert User.account_status(user) == :active
end
assert User.account_status(user) == :active
end
@@
-1750,7
+1750,7
@@
defmodule Pleroma.UserTest do
end
test "returns :deactivated for deactivated user" do
end
test "returns :deactivated for deactivated user" do
- user = insert(:user, local: true,
confirmation_pending: fals
e, deactivated: true)
+ user = insert(:user, local: true,
is_confirmed: tru
e, deactivated: true)
assert User.account_status(user) == :deactivated
end
assert User.account_status(user) == :deactivated
end
@@
-1758,7
+1758,7
@@
defmodule Pleroma.UserTest do
user = insert(:user, local: true, approval_pending: true)
assert User.account_status(user) == :approval_pending
user = insert(:user, local: true, approval_pending: true)
assert User.account_status(user) == :approval_pending
- user = insert(:user, local: true,
confirmation_pending: tru
e, approval_pending: true)
+ user = insert(:user, local: true,
is_confirmed: fals
e, approval_pending: true)
assert User.account_status(user) == :approval_pending
end
end
assert User.account_status(user) == :approval_pending
end
end
@@
-1815,7
+1815,7
@@
defmodule Pleroma.UserTest do
test "returns false when the account is unconfirmed and confirmation is required" do
Pleroma.Config.put([:instance, :account_activation_required], true)
test "returns false when the account is unconfirmed and confirmation is required" do
Pleroma.Config.put([:instance, :account_activation_required], true)
- user = insert(:user, local: true,
confirmation_pending: tru
e)
+ user = insert(:user, local: true,
is_confirmed: fals
e)
other_user = insert(:user, local: true)
refute User.visible_for(user, other_user) == :visible
other_user = insert(:user, local: true)
refute User.visible_for(user, other_user) == :visible
@@
-1824,14
+1824,14
@@
defmodule Pleroma.UserTest do
test "returns true when the account is unconfirmed and confirmation is required but the account is remote" do
Pleroma.Config.put([:instance, :account_activation_required], true)
test "returns true when the account is unconfirmed and confirmation is required but the account is remote" do
Pleroma.Config.put([:instance, :account_activation_required], true)
- user = insert(:user, local: false,
confirmation_pending: tru
e)
+ user = insert(:user, local: false,
is_confirmed: fals
e)
other_user = insert(:user, local: true)
assert User.visible_for(user, other_user) == :visible
end
test "returns true when the account is unconfirmed and confirmation is not required" do
other_user = insert(:user, local: true)
assert User.visible_for(user, other_user) == :visible
end
test "returns true when the account is unconfirmed and confirmation is not required" do
- user = insert(:user, local: true,
confirmation_pending: tru
e)
+ user = insert(:user, local: true,
is_confirmed: fals
e)
other_user = insert(:user, local: true)
assert User.visible_for(user, other_user) == :visible
other_user = insert(:user, local: true)
assert User.visible_for(user, other_user) == :visible
@@
-1840,7
+1840,7
@@
defmodule Pleroma.UserTest do
test "returns true when the account is unconfirmed and being viewed by a privileged account (confirmation required)" do
Pleroma.Config.put([:instance, :account_activation_required], true)
test "returns true when the account is unconfirmed and being viewed by a privileged account (confirmation required)" do
Pleroma.Config.put([:instance, :account_activation_required], true)
- user = insert(:user, local: true,
confirmation_pending: tru
e)
+ user = insert(:user, local: true,
is_confirmed: fals
e)
other_user = insert(:user, local: true, is_admin: true)
assert User.visible_for(user, other_user) == :visible
other_user = insert(:user, local: true, is_admin: true)
assert User.visible_for(user, other_user) == :visible