diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-10-18 18:35:58 +0200 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-10-18 18:35:58 +0200 |
| commit | 019147f1153f0df844997c04c31753c18a22509f (patch) | |
| tree | 4086ddbb3c92cd0439a973ec6f59bb2c0c758c4c /test/web/mastodon_api/controllers/timeline_controller_test.exs | |
| parent | 2473702be22a44070fcff439ac901f5b9bb0586a (diff) | |
| parent | 4053a82f41691195d1b29cc9eb3f6ed6814ee12f (diff) | |
| download | pleroma-019147f1153f0df844997c04c31753c18a22509f.tar.gz pleroma-019147f1153f0df844997c04c31753c18a22509f.zip | |
Merge branch 'develop' into feature/relay-list
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) |