projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into issue/1411
[akkoma]
/
test
/
web
/
mastodon_api
/
controllers
/
timeline_controller_test.exs
diff --git
a/test/web/mastodon_api/controllers/timeline_controller_test.exs
b/test/web/mastodon_api/controllers/timeline_controller_test.exs
index fc45c25de98c893a7f31ca67282463348064c43e..61b6cea7547c49ec2d90a115b8cf2e4abd248e3f 100644
(file)
--- 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.Config
alias Pleroma.User
alias Pleroma.Web.CommonAPI
- alias Pleroma.Web.OStatus
clear_config([:instance, :public])
clear_config([:instance, :public])
@@
-75,8
+74,7
@@
defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
{:ok, _activity} = CommonAPI.post(following, %{"status" => "test"})
{: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"})
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} = 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)
nconn = get(conn, "/api/v1/timelines/tag/2hu")
assert [%{"id" => id}] = json_response(nconn, :ok)