2 files changed, 29 insertions, 0 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index 0e7328613..5aad12593 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -67,6 +67,22 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     end
   end
 
+  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(%{"statusnetConversationId" => 1, "context" => "2hu"})
+      {:ok, _activity_two} = ActivityBuilder.insert(%{"statusnetConversationId" => 1,"context" => "2hu"})
+      {:ok, _activity_three} = ActivityBuilder.insert(%{"context" => "3hu"})
+
+      conn = conn
+      |> get("/api/statusnet/conversation/1.json")
+
+      response = json_response(conn, 200)
+
+      assert length(response) == 2
+    end
+  end
+
   describe "GET /statuses/friends_timeline.json" do
     setup [:valid_user]
     test "without valid credentials", %{conn: conn} do
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 381a9fa5b..5325110e1 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -103,4 +103,17 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
 
     assert user.following == []
   end
+
+  test "fetch statuses in a context using the conversation id" do
+    {:ok, user} = UserBuilder.insert()
+    {:ok, activity} = ActivityBuilder.insert(%{"statusnetConversationId" => 1, "context" => "2hu"})
+    {:ok, activity_two} = ActivityBuilder.insert(%{"statusnetConversationId" => 1,"context" => "2hu"})
+    {:ok, _activity_three} = ActivityBuilder.insert(%{"context" => "3hu"})
+
+    statuses = TwitterAPI.fetch_conversation(user, 1)
+
+    assert length(statuses) == 2
+    assert Enum.at(statuses, 0)["id"] == activity.id
+    assert Enum.at(statuses, 1)["id"] == activity_two.id
+  end
 end