forked from mirrors/akkoma
Make users in tests follow themselves by default.
Also fix the semantics of all tests to match.
This commit is contained in:
parent
4db5954786
commit
edc3e5bc30
5 changed files with 10 additions and 9 deletions
|
@ -9,7 +9,7 @@ defmodule Pleroma.Factory do
|
|||
password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
|
||||
bio: sequence(:bio, &"Tester Number #{&1}")
|
||||
}
|
||||
%{ user | ap_id: Pleroma.User.ap_id(user), follower_address: Pleroma.User.ap_followers(user) }
|
||||
%{ user | ap_id: Pleroma.User.ap_id(user), follower_address: Pleroma.User.ap_followers(user), following: [Pleroma.User.ap_id(user)] }
|
||||
end
|
||||
|
||||
def note_factory do
|
||||
|
|
|
@ -36,7 +36,7 @@ defmodule Pleroma.UserTest do
|
|||
followed = User.get_by_ap_id(followed.ap_id)
|
||||
assert followed.info["follower_count"] == 1
|
||||
|
||||
assert user.following == [User.ap_followers(followed)]
|
||||
assert User.ap_followers(followed) in user.following
|
||||
end
|
||||
|
||||
test "following a remote user will ensure a websub subscription is present" do
|
||||
|
@ -46,7 +46,7 @@ defmodule Pleroma.UserTest do
|
|||
assert followed.local == false
|
||||
|
||||
{:ok, user} = User.follow(user, followed)
|
||||
assert user.following == [User.ap_followers(followed)]
|
||||
assert User.ap_followers(followed) in user.following
|
||||
|
||||
query = from w in WebsubClientSubscription,
|
||||
where: w.topic == ^followed.info["topic"]
|
||||
|
|
|
@ -288,7 +288,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|
|||
|> post("/api/friendships/create.json", %{user_id: followed.id})
|
||||
|
||||
current_user = Repo.get(User, current_user.id)
|
||||
assert current_user.following == [User.ap_followers(followed)]
|
||||
assert User.ap_followers(followed) in current_user.following
|
||||
assert json_response(conn, 200) == UserView.render("show.json", %{user: followed, for: current_user})
|
||||
end
|
||||
end
|
||||
|
@ -304,7 +304,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|
|||
followed = insert(:user)
|
||||
|
||||
{:ok, current_user} = User.follow(current_user, followed)
|
||||
assert current_user.following == [User.ap_followers(followed)]
|
||||
assert User.ap_followers(followed) in current_user.following
|
||||
ActivityPub.follow(current_user, followed)
|
||||
|
||||
conn = conn
|
||||
|
@ -312,7 +312,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|
|||
|> post("/api/friendships/destroy.json", %{user_id: followed.id})
|
||||
|
||||
current_user = Repo.get(User, current_user.id)
|
||||
assert current_user.following == []
|
||||
assert current_user.following == [current_user.ap_id]
|
||||
assert json_response(conn, 200) == UserView.render("show.json", %{user: followed, for: current_user})
|
||||
end
|
||||
end
|
||||
|
|
|
@ -179,7 +179,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
|||
followed = insert(:user)
|
||||
|
||||
{:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"user_id" => followed.id})
|
||||
assert user.following == [User.ap_followers(followed)]
|
||||
assert User.ap_followers(followed) in user.following
|
||||
|
||||
{ :error, msg } = TwitterAPI.follow(user, %{"user_id" => followed.id})
|
||||
assert msg == "Could not follow user: #{followed.nickname} is already on your list."
|
||||
|
@ -190,7 +190,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
|||
followed = insert(:user)
|
||||
|
||||
{:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
|
||||
assert user.following == [User.ap_followers(followed)]
|
||||
assert User.ap_followers(followed) in user.following
|
||||
|
||||
followed = User.get_by_ap_id(followed.ap_id)
|
||||
assert followed.info["follower_count"] == 1
|
||||
|
|
|
@ -92,7 +92,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
|
|||
end
|
||||
|
||||
test "A user that follows you", %{user: user} do
|
||||
{:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]})
|
||||
follower = insert(:user)
|
||||
{:ok, follower} = User.follow(follower, user)
|
||||
{:ok, user} = User.update_follower_count(user)
|
||||
image = "https://placehold.it/48x48"
|
||||
represented = %{
|
||||
|
|
Loading…
Reference in a new issue