From c05928dbdabfafc536512341e8d64b240b097f62 Mon Sep 17 00:00:00 2001
From: Luna <git@l4.pm>
Date: Fri, 1 Feb 2019 03:55:10 -0300
Subject: use nodeinfo 2.1, add repository field

that is the only change from nodeinfo 2.0 to 2.1

also this makes the nodeinfo tests use 2.1.json instead of 2.0.json
---
 test/web/node_info_test.exs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/web/node_info_test.exs b/test/web/node_info_test.exs
index 5981c70a7..360ee0baf 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,7 @@ defmodule Pleroma.Web.NodeInfoTest do
     |> json_response(200)
 
     conn
-    |> get("/nodeinfo/2.0.json")
+    |> get("/nodeinfo/2.1.json")
     |> json_response(200)
   end
 end
-- 
cgit v1.2.3


From e8c7be38fcf416eb8676c5e586c56c15b4f88986 Mon Sep 17 00:00:00 2001
From: Luna <git@l4.pm>
Date: Fri, 1 Feb 2019 14:33:14 -0300
Subject: add tests for nodeinfo 2.0 compat and 2.1's new field

---
 test/web/node_info_test.exs | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'test')

diff --git a/test/web/node_info_test.exs b/test/web/node_info_test.exs
index 360ee0baf..763549bd1 100644
--- a/test/web/node_info_test.exs
+++ b/test/web/node_info_test.exs
@@ -61,4 +61,49 @@ defmodule Pleroma.Web.NodeInfoTest do
     |> 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
-- 
cgit v1.2.3