diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-10-27 16:11:25 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-10-27 16:11:25 +0300 |
| commit | 791bcfd90f41da9d77ab5a5ad6eec22ae8050b8a (patch) | |
| tree | 98ebe750f99cb6be2532e9dbaf3b334957353777 /test/web/mastodon_api/controllers/timeline_controller_test.exs | |
| parent | 8eff05d4c62c4d3300fee173cad84f75a0aafb4d (diff) | |
| parent | 060adfd762a5183b3cc5f51e041819b24b8430d2 (diff) | |
| download | pleroma-791bcfd90f41da9d77ab5a5ad6eec22ae8050b8a.tar.gz pleroma-791bcfd90f41da9d77ab5a5ad6eec22ae8050b8a.zip | |
Merge branch 'develop' into feature/store-statuses-data-inside-flag
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) |