hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests.

Browse source
This commit is contained in:
Ivan Tashkinov 2020-03-03 22:22:02 +03:00
commit b6fc98d9cd
4 changed files with 41 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

29
test/web/activity_pub/activity_pub_controller_test.exs
View file

@ -775,7 +775,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
assert result["first"]["orderedItems"] == [user.ap_id]
end
test "it returns returns a uri if the user has 'hide_followers' set", %{conn: conn} do
test "it returns a uri if the user has 'hide_followers' set", %{conn: conn} do
user = insert(:user)
user_two = insert(:user, hide_followers: true)
User.follow(user, user_two)
@ -1060,14 +1060,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
get_uris = [
"/users/#{user.nickname}",
"/users/#{user.nickname}/outbox",
"/users/#{user.nickname}/inbox?page=true",
"/users/#{user.nickname}/followers",
"/users/#{user.nickname}/following",
"/internal/fetch",
"/relay",
"/relay/following",
"/relay/followers",
"/api/ap/whoami"
"/relay"
]
for get_uri <- get_uris do
@ -1098,8 +1092,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
post_activity_uris = [
"/inbox",
"/relay/inbox",
"/users/#{user.nickname}/inbox",
"/users/#{user.nickname}/outbox"
"/users/#{user.nickname}/inbox"
]
for post_activity_uri <- post_activity_uris do
@ -1113,21 +1106,5 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
|> json_response(404)
end
end
test "returns 404 for media upload attempt", %{conn: conn} do
user = insert(:user)
desc = "Description of the image"
image = %Plug.Upload{
content_type: "image/jpg",
path: Path.absname("test/fixtures/image.jpg"),
filename: "an_image.jpg"
}
conn
|> assign(:user, user)
|> post("/api/ap/upload_media", %{"file" => image, "description" => desc})
|> json_response(404)
end
end
end