projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow...
[akkoma]
/
test
/
user_test.exs
diff --git
a/test/user_test.exs
b/test/user_test.exs
index e7843e1a8914ca6ef490fd0767193cf8bd9da714..991ec09725892651baa23be8d79e06fdaaa5d0aa 100644
(file)
--- a/
test/user_test.exs
+++ b/
test/user_test.exs
@@
-3,6
+3,8
@@
defmodule Pleroma.UserTest do
alias Pleroma.User
use Pleroma.DataCase
alias Pleroma.User
use Pleroma.DataCase
+ import Pleroma.Factory
+
test "ap_id returns the activity pub id for the user" do
host =
Application.get_env(:pleroma, Pleroma.Web.Endpoint)
test "ap_id returns the activity pub id for the user" do
host =
Application.get_env(:pleroma, Pleroma.Web.Endpoint)
@@
-25,21
+27,21
@@
defmodule Pleroma.UserTest do
end
test "follow takes a user and another user" do
end
test "follow takes a user and another user" do
- { :ok, user } = UserBuilder.insert
-
{ :ok, following } = UserBuilder.insert(%{nickname: "guy"}
)
+ user = insert(:user)
+
followed = insert(:user
)
- {:ok, user } = User.follow(user, follow
ing
)
+ {:ok, user } = User.follow(user, follow
ed
)
user = Repo.get(User, user.id)
user = Repo.get(User, user.id)
- assert user.following == [User.ap_followers(follow
ing
)]
+ assert user.following == [User.ap_followers(follow
ed
)]
end
test "unfollow takes a user and another user" do
end
test "unfollow takes a user and another user" do
-
{ :ok, following } = UserBuilder.insert(%{nickname: "guy"}
)
-
{ :ok, user } = UserBuilder.insert(%{following: [User.ap_followers(following
)]})
+
followed = insert(:user
)
+
user = insert(:user, %{following: [User.ap_followers(followed
)]})
- {:ok, user
} = User.unfollow(user, following
)
+ {:ok, user
, _activity } = User.unfollow(user, followed
)
user = Repo.get(User, user.id)
user = Repo.get(User, user.id)
@@
-47,8
+49,8
@@
defmodule Pleroma.UserTest do
end
test "test if a user is following another user" do
end
test "test if a user is following another user" do
-
{ :ok, followed } = UserBuilder.insert(%{nickname: "guy"}
)
-
{ :ok, user } = UserBuilder.insert(
%{following: [User.ap_followers(followed)]})
+
followed = insert(:user
)
+
user = insert(:user,
%{following: [User.ap_followers(followed)]})
assert User.following?(user, followed)
refute User.following?(followed, user)
assert User.following?(user, followed)
refute User.following?(followed, user)