projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'split-masto-api/masto_fe_and_custom_emojis' into 'develop'
[akkoma]
/
test
/
web
/
activity_pub
/
activity_pub_controller_test.exs
diff --git
a/test/web/activity_pub/activity_pub_controller_test.exs
b/test/web/activity_pub/activity_pub_controller_test.exs
index c2bcddf85b02dee13673486ca28342253567706c..1ffa91b70f990b900411778416b2067e95e8cf98 100644
(file)
--- a/
test/web/activity_pub/activity_pub_controller_test.exs
+++ b/
test/web/activity_pub/activity_pub_controller_test.exs
@@
-479,7
+479,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
conn
|> assign(:user, user)
|> put_req_header("accept", "application/activity+json")
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
assert response(conn, 200) =~ note_object.data["content"]
end
@@
-567,7
+567,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
conn =
conn
|> put_req_header("accept", "application/activity+json")
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
assert response(conn, 200) =~ note_object.data["content"]
end
@@
-579,7
+579,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
conn =
conn
|> put_req_header("accept", "application/activity+json")
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
assert response(conn, 200) =~ announce_activity.data["object"]
end
@@
-1008,7
+1008,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
conn =
conn
|> assign(:user, user)
conn =
conn
|> assign(:user, user)
- |> post("/api/ap/upload
M
edia", %{"file" => image, "description" => desc})
+ |> post("/api/ap/upload
_m
edia", %{"file" => image, "description" => desc})
assert object = json_response(conn, :created)
assert object["name"] == desc
assert object = json_response(conn, :created)
assert object["name"] == desc