From 37e443ce6c4d263f7febd7e0723be9a3a2c9ed1d Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Wed, 22 Mar 2017 16:51:20 +0100 Subject: Add friends status fetching. --- .../representers/activity_representer_test.exs | 9 +++++++-- test/web/twitter_api/twitter_api_test.exs | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) (limited to 'test/web/twitter_api') diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs index b34d3b787..ecfd5a73f 100644 --- a/test/web/twitter_api/representers/activity_representer_test.exs +++ b/test/web/twitter_api/representers/activity_representer_test.exs @@ -7,6 +7,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do test "an activity" do {:ok, user} = UserBuilder.insert content = "Some content" + date = DateTime.utc_now() |> DateTime.to_iso8601 + activity = %Activity{ id: 1, data: %{ @@ -17,9 +19,11 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do ], "actor" => User.ap_id(user), "object" => %{ + "published" => date, "type" => "Note", "content" => content - } + }, + "published" => date } } @@ -31,7 +35,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do "attentions" => [], "statusnet_html" => content, "text" => content, - "is_post_verb" => true + "is_post_verb" => true, + "created_at" => date } assert ActivityRepresenter.to_map(activity, %{user: user}) == expected_status diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index 8016f4537..5c78790af 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -20,11 +20,24 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do assert Enum.member?(get_in(activity.data, ["to"]), "https://www.w3.org/ns/activitystreams#Public") end - test "fetch public activities" do + test "fetch public statuses" do %{ public: activity, user: user } = ActivityBuilder.public_and_non_public statuses = TwitterAPI.fetch_public_statuses() assert length(statuses) == 1 assert Enum.at(statuses, 0) == ActivityRepresenter.to_map(activity, %{user: user}) end + + test "fetch friends' statuses" do + ActivityBuilder.public_and_non_public + {:ok, activity} = ActivityBuilder.insert(%{"to" => ["someguy/followers"]}) + {:ok, user} = UserBuilder.insert(%{ap_id: "some other id", following: ["someguy/followers"]}) + + statuses = TwitterAPI.fetch_friend_statuses(user) + + activity_user = Repo.get_by(User, ap_id: activity.data["actor"]) + + assert length(statuses) == 1 + assert Enum.at(statuses, 0) == ActivityRepresenter.to_map(activity, %{user: activity_user}) + end end -- cgit v1.2.3