diff options
| author | Ariadne Conill <ariadne@dereferenced.org> | 2019-10-17 23:37:21 +0000 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2019-10-18 14:50:09 +0000 |
| commit | d379b4876927701f0fa9e4886f9fd552fe71d9c9 (patch) | |
| tree | f09b568a33d200f55b6c92d9b67424b2a3d145e1 /test/web/mastodon_api/controllers | |
| parent | 6a1f4c5145c05efdfa1b0d56ba25bf87e51c7f82 (diff) | |
| download | pleroma-d379b4876927701f0fa9e4886f9fd552fe71d9c9.tar.gz pleroma-d379b4876927701f0fa9e4886f9fd552fe71d9c9.zip | |
kill almost all of the OStatus module
Diffstat (limited to 'test/web/mastodon_api/controllers')
| -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) |