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/upstream/develop' into 1335-user-api-id-fields...
[akkoma]
/
test
/
user_test.exs
diff --git
a/test/user_test.exs
b/test/user_test.exs
index 6b1b24ce5fd2ef5693937bd867b067fe420d5bd3..b0838e498e254520f0223324acc5f603c9823615 100644
(file)
--- a/
test/user_test.exs
+++ b/
test/user_test.exs
@@
-100,7
+100,7
@@
defmodule Pleroma.UserTest do
CommonAPI.follow(follower, followed)
assert [_activity] = User.get_follow_requests(followed)
CommonAPI.follow(follower, followed)
assert [_activity] = User.get_follow_requests(followed)
- {:ok, _
follower
} = User.block(followed, follower)
+ {:ok, _
user_relationship
} = User.block(followed, follower)
assert [] = User.get_follow_requests(followed)
end
assert [] = User.get_follow_requests(followed)
end
@@
-113,8
+113,8
@@
defmodule Pleroma.UserTest do
not_followed = insert(:user)
reverse_blocked = insert(:user)
not_followed = insert(:user)
reverse_blocked = insert(:user)
- {:ok,
user
} = User.block(user, blocked)
- {:ok,
reverse_blocked
} = User.block(reverse_blocked, user)
+ {:ok,
_user_relationship
} = User.block(user, blocked)
+ {:ok,
_user_relationship
} = User.block(reverse_blocked, user)
{:ok, user} = User.follow(user, followed_zero)
{:ok, user} = User.follow(user, followed_zero)
@@
-166,7
+166,7
@@
defmodule Pleroma.UserTest do
blocker = insert(:user)
blockee = insert(:user)
blocker = insert(:user)
blockee = insert(:user)
- {:ok,
blocker
} = User.block(blocker, blockee)
+ {:ok,
_user_relationship
} = User.block(blocker, blockee)
{:error, _} = User.follow(blockee, blocker)
end
{:error, _} = User.follow(blockee, blocker)
end
@@
-175,7
+175,7
@@
defmodule Pleroma.UserTest do
blocker = insert(:user)
blocked = insert(:user)
blocker = insert(:user)
blocked = insert(:user)
- {:ok,
blocker
} = User.block(blocker, blocked)
+ {:ok,
_user_relationship
} = User.block(blocker, blocked)
{:error, _} = User.subscribe(blocked, blocker)
end
{:error, _} = User.subscribe(blocked, blocker)
end
@@
-673,7
+673,7
@@
defmodule Pleroma.UserTest do
refute User.mutes?(user, muted_user)
refute User.muted_notifications?(user, muted_user)
refute User.mutes?(user, muted_user)
refute User.muted_notifications?(user, muted_user)
- {:ok,
user
} = User.mute(user, muted_user)
+ {:ok,
_user_relationships
} = User.mute(user, muted_user)
assert User.mutes?(user, muted_user)
assert User.muted_notifications?(user, muted_user)
assert User.mutes?(user, muted_user)
assert User.muted_notifications?(user, muted_user)
@@
-683,8
+683,8
@@
defmodule Pleroma.UserTest do
user = insert(:user)
muted_user = insert(:user)
user = insert(:user)
muted_user = insert(:user)
- {:ok,
user
} = User.mute(user, muted_user)
- {:ok,
user
} = User.unmute(user, muted_user)
+ {:ok,
_user_relationships
} = User.mute(user, muted_user)
+ {:ok,
_user_mute
} = User.unmute(user, muted_user)
refute User.mutes?(user, muted_user)
refute User.muted_notifications?(user, muted_user)
refute User.mutes?(user, muted_user)
refute User.muted_notifications?(user, muted_user)
@@
-697,7
+697,7
@@
defmodule Pleroma.UserTest do
refute User.mutes?(user, muted_user)
refute User.muted_notifications?(user, muted_user)
refute User.mutes?(user, muted_user)
refute User.muted_notifications?(user, muted_user)
- {:ok,
user
} = User.mute(user, muted_user, false)
+ {:ok,
_user_relationships
} = User.mute(user, muted_user, false)
assert User.mutes?(user, muted_user)
refute User.muted_notifications?(user, muted_user)
assert User.mutes?(user, muted_user)
refute User.muted_notifications?(user, muted_user)
@@
-711,7
+711,7
@@
defmodule Pleroma.UserTest do
refute User.blocks?(user, blocked_user)
refute User.blocks?(user, blocked_user)
- {:ok,
user
} = User.block(user, blocked_user)
+ {:ok,
_user_relationship
} = User.block(user, blocked_user)
assert User.blocks?(user, blocked_user)
end
assert User.blocks?(user, blocked_user)
end
@@
-720,8
+720,8
@@
defmodule Pleroma.UserTest do
user = insert(:user)
blocked_user = insert(:user)
user = insert(:user)
blocked_user = insert(:user)
- {:ok,
user
} = User.block(user, blocked_user)
- {:ok,
user
} = User.unblock(user, blocked_user)
+ {:ok,
_user_relationship
} = User.block(user, blocked_user)
+ {:ok,
_user_block
} = User.unblock(user, blocked_user)
refute User.blocks?(user, blocked_user)
end
refute User.blocks?(user, blocked_user)
end
@@
-736,7
+736,7
@@
defmodule Pleroma.UserTest do
assert User.following?(blocker, blocked)
assert User.following?(blocked, blocker)
assert User.following?(blocker, blocked)
assert User.following?(blocked, blocker)
- {:ok,
blocker
} = User.block(blocker, blocked)
+ {:ok,
_user_relationship
} = User.block(blocker, blocked)
blocked = User.get_cached_by_id(blocked.id)
assert User.blocks?(blocker, blocked)
blocked = User.get_cached_by_id(blocked.id)
assert User.blocks?(blocker, blocked)
@@
-754,7
+754,7
@@
defmodule Pleroma.UserTest do
assert User.following?(blocker, blocked)
refute User.following?(blocked, blocker)
assert User.following?(blocker, blocked)
refute User.following?(blocked, blocker)
- {:ok,
blocker
} = User.block(blocker, blocked)
+ {:ok,
_user_relationship
} = User.block(blocker, blocked)
blocked = User.get_cached_by_id(blocked.id)
assert User.blocks?(blocker, blocked)
blocked = User.get_cached_by_id(blocked.id)
assert User.blocks?(blocker, blocked)
@@
-772,7
+772,7
@@
defmodule Pleroma.UserTest do
refute User.following?(blocker, blocked)
assert User.following?(blocked, blocker)
refute User.following?(blocker, blocked)
assert User.following?(blocked, blocker)
- {:ok,
blocker
} = User.block(blocker, blocked)
+ {:ok,
_user_relationship
} = User.block(blocker, blocked)
blocked = User.get_cached_by_id(blocked.id)
assert User.blocks?(blocker, blocked)
blocked = User.get_cached_by_id(blocked.id)
assert User.blocks?(blocker, blocked)
@@
-790,7
+790,7
@@
defmodule Pleroma.UserTest do
assert User.subscribed_to?(blocked, blocker)
refute User.subscribed_to?(blocker, blocked)
assert User.subscribed_to?(blocked, blocker)
refute User.subscribed_to?(blocker, blocked)
- {:ok,
blocker
} = User.block(blocker, blocked)
+ {:ok,
_user_relationship
} = User.block(blocker, blocked)
assert User.blocks?(blocker, blocked)
refute User.subscribed_to?(blocker, blocked)
assert User.blocks?(blocker, blocked)
refute User.subscribed_to?(blocker, blocked)
@@
-1195,6
+1195,13
@@
defmodule Pleroma.UserTest do
refute User.auth_active?(local_user)
assert User.auth_active?(confirmed_user)
assert User.auth_active?(remote_user)
refute User.auth_active?(local_user)
assert User.auth_active?(confirmed_user)
assert User.auth_active?(remote_user)
+
+ # also shows unactive for deactivated users
+
+ deactivated_but_confirmed =
+ insert(:user, local: true, confirmation_pending: false, deactivated: true)
+
+ refute User.auth_active?(deactivated_but_confirmed)
end
describe "superuser?/1" do
end
describe "superuser?/1" do
@@
-1313,7
+1320,8
@@
defmodule Pleroma.UserTest do
{:ok, _follower2} = User.follow(follower2, user)
{:ok, _follower3} = User.follow(follower3, user)
{:ok, _follower2} = User.follow(follower2, user)
{:ok, _follower3} = User.follow(follower3, user)
- {:ok, user} = User.block(user, follower)
+ {:ok, _user_relationship} = User.block(user, follower)
+ user = refresh_record(user)
assert User.user_info(user).follower_count == 2
end
assert User.user_info(user).follower_count == 2
end