diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-05-05 11:46:59 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-05-05 11:46:59 +0200 |
| commit | c48c381e909240dcece9f961e4728fa712d089cc (patch) | |
| tree | 6aa2a1edbfe5d15860ab5090c645bc9ba312ab96 /test/web/twitter_api/twitter_api_controller_test.exs | |
| parent | 6cf7c132282e612514af992c6dea0b03ee5b678d (diff) | |
| parent | c85998ab8a21f042ab57345a7baa9e1e27c308d1 (diff) | |
| download | pleroma-c48c381e909240dcece9f961e4728fa712d089cc.tar.gz | |
Merge branch 'develop' into dtluna/pleroma-refactor/1
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_controller_test.exs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index 6c249be7d..05cd084b4 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -84,12 +84,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(%{"statusnetConversationId" => 1, "context" => "2hu"}) - {:ok, _activity_two} = ActivityBuilder.insert(%{"statusnetConversationId" => 1,"context" => "2hu"}) + {:ok, _activity} = ActivityBuilder.insert(%{"context" => "2hu"}) + {:ok, _activity_two} = ActivityBuilder.insert(%{"context" => "2hu"}) {:ok, _activity_three} = ActivityBuilder.insert(%{"context" => "3hu"}) + {:ok, object} = Object.context_mapping("2hu") |> Repo.insert conn = conn - |> get("/api/statusnet/conversation/1.json") + |> get("/api/statusnet/conversation/#{object.id}.json") response = json_response(conn, 200) |