diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-26 06:11:52 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-26 06:11:52 +0000 |
| commit | 2b98ef832ca7db7be86667646502c47a43e5d7af (patch) | |
| tree | bfbc37f3692d16288b8f34867efbc85cb930f58c /test/web/activity_pub/activity_pub_controller_test.exs | |
| parent | 53b4daa514479172c6b63e655bf626175c5f0f35 (diff) | |
| parent | 6d1ca73466bddb40684a2b3f545da6676ed71add (diff) | |
| download | pleroma-2b98ef832ca7db7be86667646502c47a43e5d7af.tar.gz pleroma-2b98ef832ca7db7be86667646502c47a43e5d7af.zip | |
Merge branch 'backport/1.1-hackney-and-outbox-fixes' into 'maint/1.1'
Backport/1.1 hackney and outbox fixes
See merge request pleroma/pleroma!1718
Diffstat (limited to 'test/web/activity_pub/activity_pub_controller_test.exs')
| -rw-r--r-- | test/web/activity_pub/activity_pub_controller_test.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs index 9698c7099..6fb7a7dda 100644 --- a/test/web/activity_pub/activity_pub_controller_test.exs +++ b/test/web/activity_pub/activity_pub_controller_test.exs @@ -473,7 +473,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do conn |> assign(:user, user) |> put_req_header("accept", "application/activity+json") - |> get("/users/#{user.nickname}/inbox") + |> get("/users/#{user.nickname}/inbox?page=true") assert response(conn, 200) =~ note_object.data["content"] end @@ -559,7 +559,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do conn = conn |> put_req_header("accept", "application/activity+json") - |> get("/users/#{user.nickname}/outbox") + |> get("/users/#{user.nickname}/outbox?page=true") assert response(conn, 200) =~ note_object.data["content"] end @@ -571,7 +571,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do conn = conn |> put_req_header("accept", "application/activity+json") - |> get("/users/#{user.nickname}/outbox") + |> get("/users/#{user.nickname}/outbox?page=true") assert response(conn, 200) =~ announce_activity.data["object"] end |