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

Merge branch 'develop' into 'develop'

Browse source 
Use nodeinfo 2.1

See merge request pleroma/pleroma!753
This commit is contained in:
href 2019-02-01 19:18:46 +00:00
commit 7e384a2425
3 changed files with 85 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

51
test/web/node_info_test.exs
View file

@ -12,7 +12,7 @@ defmodule Pleroma.Web.NodeInfoTest do
conn =
conn
|> get("/nodeinfo/2.0.json")
|> get("/nodeinfo/2.1.json")
assert result = json_response(conn, 200)
@ -22,7 +22,7 @@ defmodule Pleroma.Web.NodeInfoTest do
test "nodeinfo shows restricted nicknames", %{conn: conn} do
conn =
conn
|> get("/nodeinfo/2.0.json")
|> get("/nodeinfo/2.1.json")
assert result = json_response(conn, 200)
@ -41,6 +41,38 @@ defmodule Pleroma.Web.NodeInfoTest do
|> get("/.well-known/nodeinfo")
|> json_response(404)
conn
|> get("/nodeinfo/2.1.json")
|> json_response(404)
instance =
Application.get_env(:pleroma, :instance)
|> Keyword.put(:federating, true)
Application.put_env(:pleroma, :instance, instance)
end
test "returns 200 when federation is enabled", %{conn: conn} do
conn
|> get("/.well-known/nodeinfo")
|> json_response(200)
conn
|> get("/nodeinfo/2.1.json")
|> json_response(200)
end
test "returns 404 when federation is disabled (nodeinfo 2.0)", %{conn: conn} do
instance =
Application.get_env(:pleroma, :instance)
|> Keyword.put(:federating, false)
Application.put_env(:pleroma, :instance, instance)
conn
|> get("/.well-known/nodeinfo")
|> json_response(404)
conn
|> get("/nodeinfo/2.0.json")
|> json_response(404)
@ -52,7 +84,7 @@ defmodule Pleroma.Web.NodeInfoTest do
Application.put_env(:pleroma, :instance, instance)
end
test "returns 200 when federation is enabled", %{conn: conn} do
test "returns 200 when federation is enabled (nodeinfo 2.0)", %{conn: conn} do
conn
|> get("/.well-known/nodeinfo")
|> json_response(200)
@ -61,4 +93,17 @@ defmodule Pleroma.Web.NodeInfoTest do
|> get("/nodeinfo/2.0.json")
|> json_response(200)
end
test "returns software.repository field in nodeinfo 2.1", %{conn: conn} do
conn
|> get("/.well-known/nodeinfo")
|> json_response(200)
conn =
conn
|> get("/nodeinfo/2.1.json")
assert result = json_response(conn, 200)
assert Pleroma.Application.repository() == result["software"]["repository"]
end
end