X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Ftwitter_api_test.exs;h=bbb261eff3c143459a90b9058b3ba4827fadd3cc;hb=d1c10ad2fb7641c88eec04e9474af143170c507a;hp=f591bef4a02ad6f1cbb772d25095208e2047e4ff;hpb=d4de38e8fff3154259e08292de60900488c210d6;p=akkoma

diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index f591bef4a..bbb261eff 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -9,7 +9,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
   import Pleroma.Factory
 
   test "create a status" do
-    user = UserBuilder.build(%{ap_id: "142344"})
+    user = insert(:user)
     _mentioned_user = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"})
 
     object_data = %{
@@ -52,10 +52,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     assert is_list(activity.data["object"]["attachment"])
 
     assert activity.data["object"] == Object.get_by_ap_id(activity.data["object"]["id"]).data
+
+    user = User.get_by_ap_id(user.ap_id)
+
+    assert user.info["note_count"] == 1
   end
 
   test "create a status that is a reply" do
-    user = UserBuilder.build(%{ap_id: "some_cool_id"})
+    user = insert(:user)
     input = %{
       "status" => "Hello again."
     }
@@ -73,7 +77,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     assert get_in(reply.data, ["object", "context"]) == get_in(activity.data, ["object", "context"])
     assert get_in(reply.data, ["object", "inReplyTo"]) == get_in(activity.data, ["object", "id"])
     assert get_in(reply.data, ["object", "inReplyToStatusId"]) == activity.id
-    assert Enum.member?(get_in(reply.data, ["to"]), "some_cool_id")
+    assert Enum.member?(get_in(reply.data, ["to"]), user.ap_id)
   end
 
   test "fetch public statuses, excluding remote ones." do
@@ -187,6 +191,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     {:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
     assert user.following == [User.ap_followers(followed)]
 
+    followed = User.get_by_ap_id(followed.ap_id)
+    assert followed.info["follower_count"] == 1
+
     { :error, msg } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
     assert msg == "Could not follow user: #{followed.nickname} is already on your list."
   end
@@ -218,9 +225,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
 
   test "fetch statuses in a context using the conversation id" do
     {:ok, user} = UserBuilder.insert()
-    {:ok, activity} = ActivityBuilder.insert(%{"context" => "2hu"})
-    {:ok, activity_two} = ActivityBuilder.insert(%{"context" => "2hu"})
-    {:ok, _activity_three} = ActivityBuilder.insert(%{"context" => "3hu"})
+    {:ok, activity} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"})
+    {:ok, activity_two} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"})
+    {:ok, _activity_three} = ActivityBuilder.insert(%{"type" => "Create", "context" => "3hu"})
 
     {:ok, object} = Object.context_mapping("2hu") |> Repo.insert