Merge branch 'develop' into update-oauth-template

1 files changed, 16 insertions, 64 deletions

diff --git a/test/web/node_info_test.exs b/test/web/node_info_test.exs
index 2fc42b7cc..be1173513 100644
--- a/test/web/node_info_test.exs
+++ b/test/web/node_info_test.exs
@@ -7,6 +7,22 @@ defmodule Pleroma.Web.NodeInfoTest do
 
   import Pleroma.Factory
 
+  test "GET /.well-known/nodeinfo", %{conn: conn} do
+    links =
+      conn
+      |> get("/.well-known/nodeinfo")
+      |> json_response(200)
+      |> Map.fetch!("links")
+
+    Enum.each(links, fn link ->
+      href = Map.fetch!(link, "href")
+
+      conn
+      |> get(href)
+      |> json_response(200)
+    end)
+  end
+
   test "nodeinfo shows staff accounts", %{conn: conn} do
     moderator = insert(:user, %{local: true, info: %{is_moderator: true}})
     admin = insert(:user, %{local: true, info: %{is_admin: true}})
@@ -32,70 +48,6 @@ defmodule Pleroma.Web.NodeInfoTest do
              result["metadata"]["restrictedNicknames"]
   end
 
-  test "returns 404 when federation is disabled", %{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.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)
-
-    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")