diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-18 16:04:57 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-18 16:04:57 +0000 |
| commit | 4053a82f41691195d1b29cc9eb3f6ed6814ee12f (patch) | |
| tree | 31075bdd659c45b688e3b670acc5c9b41a7abc63 /test/web/mastodon_api/controllers/timeline_controller_test.exs | |
| parent | 223c0c0136be81a363b114538948e8e0317540af (diff) | |
| parent | c2ae6310dc09e65515c7b8774d2b85b5ef7da1a1 (diff) | |
| download | pleroma-4053a82f41691195d1b29cc9eb3f6ed6814ee12f.tar.gz pleroma-4053a82f41691195d1b29cc9eb3f6ed6814ee12f.zip | |
Merge branch 'feature/ostatus-removal' into 'develop'
ostatus removal
Closes #1145
See merge request pleroma/pleroma!1854
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) |