diff options
author | lain <lain@soykaf.club> | 2020-09-22 17:13:46 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-09-22 17:13:46 +0200 |
commit | c95859e45b18dec1d00f721ef3c5b4bb1406ea37 (patch) | |
tree | c22f7a200c0e0e551796bf5e9f1b09afccd64dd4 /test/web/mastodon_api/controllers/timeline_controller_test.exs | |
parent | 9853c90abba213bdc87dccf5620cb0d9eb19c049 (diff) | |
parent | 02f12ec6253093d8bedaf84d78d0f7e533745e1b (diff) | |
download | pleroma-c95859e45b18dec1d00f721ef3c5b4bb1406ea37.tar.gz pleroma-c95859e45b18dec1d00f721ef3c5b4bb1406ea37.zip |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
Diffstat (limited to 'test/web/mastodon_api/controllers/timeline_controller_test.exs')
-rw-r--r-- | test/web/mastodon_api/controllers/timeline_controller_test.exs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/test/web/mastodon_api/controllers/timeline_controller_test.exs b/test/web/mastodon_api/controllers/timeline_controller_test.exs index 517cabcff..c6e0268fd 100644 --- a/test/web/mastodon_api/controllers/timeline_controller_test.exs +++ b/test/web/mastodon_api/controllers/timeline_controller_test.exs @@ -114,8 +114,16 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do {:ok, _reply_from_friend} = CommonAPI.post(friend, %{status: "status", in_reply_to_status_id: reply_from_blockee}) - res_conn = get(conn, "/api/v1/timelines/public") - [%{"id" => ^activity_id}] = json_response_and_validate_schema(res_conn, 200) + # Still shows replies from yourself + {:ok, %{id: reply_from_me}} = + CommonAPI.post(blocker, %{status: "status", in_reply_to_status_id: reply_from_blockee}) + + response = + get(conn, "/api/v1/timelines/public") + |> json_response_and_validate_schema(200) + + assert length(response) == 2 + [%{"id" => ^reply_from_me}, %{"id" => ^activity_id}] = response end test "doesn't return replies if follow is posting with users from blocked domain" do |