X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Ftwitter_api_test.exs;h=3a1745a1bc671a9892d18f81718531a738628fed;hb=d952b6cd7bd54f6d10d4f71e0ffb25b5f0e20582;hp=cf264981714db3e3375b049cf7418ade01c78176;hpb=7a0046d1271d97d635294ee0cace135d32b141ba;p=akkoma
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index cf2649817..3a1745a1b 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -78,7 +78,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
test "fetch public statuses" do
%{ public: activity, user: user } = ActivityBuilder.public_and_non_public
- {:ok, follower } = UserBuilder.insert(%{name: "dude", ap_id: "idididid", following: [User.ap_followers(user)]})
+
+ follower = insert(:user, following: [User.ap_followers(user)])
statuses = TwitterAPI.fetch_public_statuses(follower)
@@ -87,34 +88,47 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
end
test "fetch friends' statuses" do
- ActivityBuilder.public_and_non_public
-
+ user = insert(:user, %{following: ["someguy/followers"]})
{:ok, activity} = ActivityBuilder.insert(%{"to" => ["someguy/followers"]})
- {:ok, direct_activity} = ActivityBuilder.insert(%{"to" => ["some other id"]})
- {:ok, user} = UserBuilder.insert(%{ap_id: "some other id", following: ["someguy/followers"]})
+ {:ok, direct_activity} = ActivityBuilder.insert(%{"to" => [user.ap_id]})
statuses = TwitterAPI.fetch_friend_statuses(user)
activity_user = Repo.get_by(User, ap_id: activity.data["actor"])
+ direct_activity_user = Repo.get_by(User, ap_id: direct_activity.data["actor"])
assert length(statuses) == 2
assert Enum.at(statuses, 0) == ActivityRepresenter.to_map(activity, %{user: activity_user})
- assert Enum.at(statuses, 1) == ActivityRepresenter.to_map(direct_activity, %{user: activity_user, mentioned: [user]})
+ assert Enum.at(statuses, 1) == ActivityRepresenter.to_map(direct_activity, %{user: direct_activity_user, mentioned: [user]})
+ end
+
+ test "get a user by params" do
+ user1_result = {:ok, user1} = UserBuilder.insert(%{ap_id: "some id", email: "test@pleroma"})
+ {:ok, user2} = UserBuilder.insert(%{ap_id: "some other id", nickname: "testname2", email: "test2@pleroma"})
+
+ assert {:error, "You need to specify screen_name or user_id"} == TwitterAPI.get_user(nil, nil)
+ assert user1_result == TwitterAPI.get_user(nil, %{"user_id" => user1.id})
+ assert user1_result == TwitterAPI.get_user(nil, %{"screen_name" => user1.nickname})
+ assert user1_result == TwitterAPI.get_user(user1, nil)
+ assert user1_result == TwitterAPI.get_user(user2, %{"user_id" => user1.id})
+ assert user1_result == TwitterAPI.get_user(user2, %{"screen_name" => user1.nickname})
+ assert {:error, "No user with such screen_name"} == TwitterAPI.get_user(nil, %{"screen_name" => "Satan"})
+ assert {:error, "No user with such user_id"} == TwitterAPI.get_user(nil, %{"user_id" => 666})
end
test "fetch user's statuses" do
- {:ok, user1} = UserBuilder.insert(%{ap_id: "some id"})
- {:ok, user2} = UserBuilder.insert(%{ap_id: "some other id", nickname: "testname2"})
+ {:ok, user1} = UserBuilder.insert(%{ap_id: "some id", email: "test@pleroma"})
+ {:ok, user2} = UserBuilder.insert(%{ap_id: "some other id", nickname: "testname2", email: "test2@pleroma"})
{:ok, status1} = ActivityBuilder.insert(%{"id" => 1}, %{user: user1})
{:ok, status2} = ActivityBuilder.insert(%{"id" => 2}, %{user: user2})
- user1_statuses = TwitterAPI.fetch_user_statuses(user1, %{})
+ user1_statuses = TwitterAPI.fetch_user_statuses(user1, %{"actor_id" => user1.ap_id})
assert length(user1_statuses) == 1
assert Enum.at(user1_statuses, 0) == ActivityRepresenter.to_map(status1, %{user: user1})
- user2_statuses = TwitterAPI.fetch_user_statuses(user1, %{"screen_name" => user2.nickname })
+ user2_statuses = TwitterAPI.fetch_user_statuses(user1, %{"actor_id" => user2.ap_id})
assert length(user2_statuses) == 1
assert Enum.at(user2_statuses, 0) == ActivityRepresenter.to_map(status2, %{user: user2})
@@ -130,28 +144,39 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
assert status == ActivityRepresenter.to_map(activity, %{for: user, user: actor})
end
- test "Follow another user" do
- { :ok, user } = UserBuilder.insert
- { :ok, following } = UserBuilder.insert(%{nickname: "guy"})
+ test "Follow another user using user_id" do
+ user = insert(:user)
+ followed = insert(:user)
+
+ {:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"user_id" => followed.id})
+ assert user.following == [User.ap_followers(followed)]
- {:ok, user, following, activity } = TwitterAPI.follow(user, following.id)
+ { :error, msg } = TwitterAPI.follow(user, %{"user_id" => followed.id})
+ assert msg == "Could not follow user: #{followed.nickname} is already on your list."
+ end
- user = Repo.get(User, user.id)
- follow = Repo.get(Activity, activity.id)
+ test "Follow another user using screen_name" do
+ user = insert(:user)
+ followed = insert(:user)
+
+ {:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
+ assert user.following == [User.ap_followers(followed)]
- assert user.following == [User.ap_followers(following)]
- assert follow == activity
+ { :error, msg } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
+ assert msg == "Could not follow user: #{followed.nickname} is already on your list."
end
test "Unfollow 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, _following } = TwitterAPI.unfollow(user, following.id)
+ { :ok, user, _followed } = TwitterAPI.unfollow(user, followed.id)
user = Repo.get(User, user.id)
assert user.following == []
+ { :error, msg } = TwitterAPI.unfollow(user, followed.id)
+ assert msg == "Not subscribed!"
end
test "fetch statuses in a context using the conversation id" do
@@ -178,8 +203,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
test "it can parse mentions and return the relevant users" do
text = "@gsimg According to @archaeme , that is @daggsy."
- {:ok, gsimg} = UserBuilder.insert(%{nickname: "gsimg"})
- {:ok, archaeme} = UserBuilder.insert(%{nickname: "archaeme"})
+ gsimg = insert(:user, %{nickname: "gsimg"})
+ archaeme = insert(:user, %{nickname: "archaeme"})
expected_result = [
{"@gsimg", gsimg},
@@ -192,11 +217,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
test "it adds user links to an existing text" do
text = "@gsimg According to @archaeme , that is @daggsy."
- {:ok, _gsimg} = UserBuilder.insert(%{nickname: "gsimg", ap_id: "first_link" })
- {:ok, _archaeme} = UserBuilder.insert(%{nickname: "archaeme", ap_id: "second_link"})
+ gsimg = insert(:user, %{nickname: "gsimg"})
+ archaeme = insert(:user, %{nickname: "archaeme"})
mentions = TwitterAPI.parse_mentions(text)
- expected_text = "@gsimg According to @archaeme , that is @daggsy."
+ expected_text = "@gsimg According to @archaeme , that is @daggsy."
assert TwitterAPI.add_user_links(text, mentions) == expected_text
end
@@ -270,8 +295,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
end
setup do
- Supervisor.terminate_child(Pleroma.Supervisor, ConCache)
- Supervisor.restart_child(Pleroma.Supervisor, ConCache)
+ Supervisor.terminate_child(Pleroma.Supervisor, Cachex)
+ Supervisor.restart_child(Pleroma.Supervisor, Cachex)
:ok
end
end