projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/object-attachment-spoof' into 'develop'
[akkoma]
/
test
/
pleroma
/
user_test.exs
diff --git
a/test/pleroma/user_test.exs
b/test/pleroma/user_test.exs
index d506f704708a6c7f501bf51db735b8f5cd301b21..d8ac652af59fb562fc40a326de307139a17433a8 100644
(file)
--- a/
test/pleroma/user_test.exs
+++ b/
test/pleroma/user_test.exs
@@
-174,7
+174,7
@@
defmodule Pleroma.UserTest do
test "returns all pending follow requests" do
unlocked = insert(:user)
test "returns all pending follow requests" do
unlocked = insert(:user)
- locked = insert(:user, locked: true)
+ locked = insert(:user,
is_
locked: true)
follower = insert(:user)
CommonAPI.follow(follower, unlocked)
follower = insert(:user)
CommonAPI.follow(follower, unlocked)
@@
-187,7
+187,7
@@
defmodule Pleroma.UserTest do
end
test "doesn't return already accepted or duplicate follow requests" do
end
test "doesn't return already accepted or duplicate follow requests" do
- locked = insert(:user, locked: true)
+ locked = insert(:user,
is_
locked: true)
pending_follower = insert(:user)
accepted_follower = insert(:user)
pending_follower = insert(:user)
accepted_follower = insert(:user)
@@
-201,7
+201,7
@@
defmodule Pleroma.UserTest do
end
test "doesn't return follow requests for deactivated accounts" do
end
test "doesn't return follow requests for deactivated accounts" do
- locked = insert(:user, locked: true)
+ locked = insert(:user,
is_
locked: true)
pending_follower = insert(:user, %{deactivated: true})
CommonAPI.follow(pending_follower, locked)
pending_follower = insert(:user, %{deactivated: true})
CommonAPI.follow(pending_follower, locked)
@@
-211,7
+211,7
@@
defmodule Pleroma.UserTest do
end
test "clears follow requests when requester is blocked" do
end
test "clears follow requests when requester is blocked" do
- followed = insert(:user, locked: true)
+ followed = insert(:user,
is_
locked: true)
follower = insert(:user)
CommonAPI.follow(follower, followed)
follower = insert(:user)
CommonAPI.follow(follower, followed)
@@
-299,8
+299,8
@@
defmodule Pleroma.UserTest do
end
test "local users do not automatically follow local locked accounts" do
end
test "local users do not automatically follow local locked accounts" do
- follower = insert(:user, locked: true)
- followed = insert(:user, locked: true)
+ follower = insert(:user,
is_
locked: true)
+ followed = insert(:user,
is_
locked: true)
{:ok, follower} = User.maybe_direct_follow(follower, followed)
{:ok, follower} = User.maybe_direct_follow(follower, followed)
@@
-1360,7
+1360,7
@@
defmodule Pleroma.UserTest do
follower = insert(:user)
{:ok, follower} = User.follow(follower, user)
follower = insert(:user)
{:ok, follower} = User.follow(follower, user)
- locked_user = insert(:user, name: "locked", locked: true)
+ locked_user = insert(:user, name: "locked",
is_
locked: true)
{:ok, _} = User.follow(user, locked_user, :follow_pending)
object = insert(:note, user: user)
{:ok, _} = User.follow(user, locked_user, :follow_pending)
object = insert(:note, user: user)
@@
-1450,7
+1450,7
@@
defmodule Pleroma.UserTest do
note_count: 9,
follower_count: 9,
following_count: 9001,
note_count: 9,
follower_count: 9,
following_count: 9001,
- locked: true,
+
is_
locked: true,
confirmation_pending: true,
password_reset_pending: true,
approval_pending: true,
confirmation_pending: true,
password_reset_pending: true,
approval_pending: true,
@@
-1492,7
+1492,7
@@
defmodule Pleroma.UserTest do
note_count: 0,
follower_count: 0,
following_count: 0,
note_count: 0,
follower_count: 0,
following_count: 0,
- locked: false,
+
is_
locked: false,
confirmation_pending: false,
password_reset_pending: false,
approval_pending: false,
confirmation_pending: false,
password_reset_pending: false,
approval_pending: false,