aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorlambadalambda <gitgud@rogerbraun.net>2017-04-10 08:44:19 -0400
committerlambadalambda <gitgud@rogerbraun.net>2017-04-10 08:44:19 -0400
commitb5e94bf9301713fd9eb3b80dbcf64ae6782092bc (patch)
tree71f83f23cc47ae1058bdb26b23f12277c31acf7b /test
parent567ec494c523ded79c69f4d1bb0be9e51ca09837 (diff)
parent0016589aea391fd6b8d41257b7f39f76b5b93775 (diff)
downloadpleroma-b5e94bf9301713fd9eb3b80dbcf64ae6782092bc.tar.gz
Merge branch 'develop' into 'develop'
Add Follow activity insertion See merge request !1
Diffstat (limited to 'test')
-rw-r--r--test/web/twitter_api/twitter_api_test.exs4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 99b6a6cb2..ad932131a 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -107,11 +107,13 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
{ :ok, user } = UserBuilder.insert
{ :ok, following } = UserBuilder.insert(%{nickname: "guy"})
- {:ok, user, following } = TwitterAPI.follow(user, following.id)
+ {:ok, user, following, activity } = TwitterAPI.follow(user, following.id)
user = Repo.get(User, user.id)
+ follow = Repo.get(Activity, activity.id)
assert user.following == [User.ap_followers(following)]
+ assert follow == activity
end
test "Unfollow another user" do