Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs

# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex

1 files changed, 48 insertions, 3 deletions

diff --git a/test/web/node_info_test.exs b/test/web/node_info_test.exs
index 5981c70a7..763549bd1 100644
--- a/test/web/node_info_test.exs
+++ b/test/web/node_info_test.exs
@@ -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)
 
@@ -42,7 +42,7 @@ defmodule Pleroma.Web.NodeInfoTest do
     |> json_response(404)
 
     conn
-    |> get("/nodeinfo/2.0.json")
+    |> get("/nodeinfo/2.1.json")
     |> json_response(404)
 
     instance =
@@ -58,7 +58,52 @@ defmodule Pleroma.Web.NodeInfoTest do
     |> 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)
+
+    instance =
+      Application.get_env(:pleroma, :instance)
+      |> Keyword.put(:federating, true)
+
+    Application.put_env(:pleroma, :instance, instance)
+  end
+
+  test "returns 200 when federation is enabled (nodeinfo 2.0)", %{conn: conn} do
+    conn
+    |> get("/.well-known/nodeinfo")
+    |> json_response(200)
+
+    conn
     |> 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