From 2db28df4cffa2ef43a84ac68caee6cef24cce19b Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Tue, 21 Mar 2017 21:09:20 +0100 Subject: Add public timeline TwAPI. --- test/web/activity_pub/activity_pub_test.exs | 2 +- test/web/twitter_api/twitter_api_controller_test.exs | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs index 6f636d5d1..ba157f191 100644 --- a/test/web/activity_pub/activity_pub_test.exs +++ b/test/web/activity_pub/activity_pub_test.exs @@ -41,7 +41,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do since_id = List.last(activities).id last_expected = List.last(later_activities) - activities = ActivityPub.fetch_public_activities(%{since_id: since_id}) + activities = ActivityPub.fetch_public_activities(%{"since_id" => since_id}) last = List.last(activities) assert length(activities) == 10 diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index c3241817d..e243942c6 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -1,7 +1,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do use Pleroma.Web.ConnCase alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter} - alias Pleroma.Builders.UserBuilder + alias Pleroma.Builders.{ActivityBuilder, UserBuilder} alias Pleroma.{Repo, Activity} describe "POST /api/account/verify_credentials" do @@ -36,6 +36,22 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do end end + describe "GET /statuses/public_timeline.json" do + test "returns statuses", %{conn: conn} do + {:ok, user} = UserBuilder.insert + activities = ActivityBuilder.insert_list(30, %{}, %{user: user}) + ActivityBuilder.insert_list(10, %{}, %{user: user}) + since_id = List.last(activities).id + + conn = conn + |> get("/api/statuses/public_timeline.json", %{since_id: since_id}) + + response = json_response(conn, 200) + + assert length(response) == 10 + end + end + defp valid_user(_context) do { :ok, user } = UserBuilder.insert [user: user] -- cgit v1.2.3