2 files changed, 28 insertions, 4 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index 2cbcfd086..6084381cb 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -160,15 +160,13 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
   describe "GET /statusnet/conversation/:id.json" do
     test "returns the statuses in the conversation", %{conn: conn} do
       {:ok, _user} = UserBuilder.insert()
-      {:ok, _activity} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"})
+      {: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()
-
       conn =
         conn
-        |> get("/api/statusnet/conversation/#{object.id}.json")
+        |> get("/api/statusnet/conversation/#{activity.data["context_id"]}.json")
 
       response = json_response(conn, 200)
 
diff --git a/test/web/twitter_api/views/activity_view_test.exs b/test/web/twitter_api/views/activity_view_test.exs
index cb8f60fcf..46ffdef44 100644
--- a/test/web/twitter_api/views/activity_view_test.exs
+++ b/test/web/twitter_api/views/activity_view_test.exs
@@ -10,7 +10,9 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do
   alias Pleroma.Activity
   alias Pleroma.User
   alias Pleroma.Web.ActivityPub.ActivityPub
+
   import Pleroma.Factory
+  import Mock
 
   test "a create activity with a note" do
     user = insert(:user)
@@ -51,6 +53,30 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do
     assert result == expected
   end
 
+  test "a list of activities" do
+    user = insert(:user)
+    other_user = insert(:user, %{nickname: "shp"})
+    {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!"})
+
+    convo_id = TwitterAPI.context_to_conversation_id(activity.data["object"]["context"])
+
+    mocks = [
+      {
+        TwitterAPI,
+        [],
+        [context_to_conversation_id: fn(_) -> false end]
+      }
+    ]
+
+    with_mocks mocks do
+      [result] = ActivityView.render("index.json", activities: [activity])
+
+      assert result["statusnet_conversation_id"] == convo_id
+      assert result["user"]
+      refute called TwitterAPI.context_to_conversation_id(:_)
+    end
+  end
+
   test "an activity that is a reply" do
     user = insert(:user)
     other_user = insert(:user, %{nickname: "shp"})