diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-10-18 17:56:15 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-10-18 17:56:15 -0500 |
| commit | dcb23a85b6b05db4958b82ad14083cfa8577f477 (patch) | |
| tree | cc8197a3780fcab86a10b1055501ba570b8e0c3b /test/web/mastodon_api/controllers/timeline_controller_test.exs | |
| parent | 152caef51d69ba4a47ac59346c782dfff8488f8b (diff) | |
| parent | 5c6c3026ea7bd20cb2c10f6e2e34a54734d2509e (diff) | |
| download | pleroma-dcb23a85b6b05db4958b82ad14083cfa8577f477.tar.gz pleroma-dcb23a85b6b05db4958b82ad14083cfa8577f477.zip | |
Merge branch 'develop' into feature/push-subject-for-dm
Diffstat (limited to 'test/web/mastodon_api/controllers/timeline_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/timeline_controller_test.exs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/test/web/mastodon_api/controllers/timeline_controller_test.exs b/test/web/mastodon_api/controllers/timeline_controller_test.exs index fc45c25de..61b6cea75 100644 --- a/test/web/mastodon_api/controllers/timeline_controller_test.exs +++ b/test/web/mastodon_api/controllers/timeline_controller_test.exs @@ -11,7 +11,6 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do alias Pleroma.Config alias Pleroma.User alias Pleroma.Web.CommonAPI - alias Pleroma.Web.OStatus clear_config([:instance, :public]) @@ -75,8 +74,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do {:ok, _activity} = CommonAPI.post(following, %{"status" => "test"}) - {:ok, [_activity]} = - OStatus.fetch_activity_from_url("https://shitposter.club/notice/2827873") + _activity = insert(:note_activity, local: false) conn = get(conn, "/api/v1/timelines/public", %{"local" => "False"}) @@ -271,9 +269,6 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do {:ok, activity} = CommonAPI.post(following, %{"status" => "test #2hu"}) - {:ok, [_activity]} = - OStatus.fetch_activity_from_url("https://shitposter.club/notice/2827873") - nconn = get(conn, "/api/v1/timelines/tag/2hu") assert [%{"id" => id}] = json_response(nconn, :ok) |