X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fpleroma%2Fweb%2Fnode_info_test.exs;h=477c44a518d60e822c7df84cbb598f6a90384ba0;hb=dfeb3862da2ceaf63db300be1a916f5139250bc2;hp=06b33607fb4ace57cfe545e8976e6285a6c2aa8b;hpb=1fb9452131721456adf2c19c513e6343f64825a7;p=akkoma

diff --git a/test/pleroma/web/node_info_test.exs b/test/pleroma/web/node_info_test.exs
index 06b33607f..477c44a51 100644
--- a/test/pleroma/web/node_info_test.exs
+++ b/test/pleroma/web/node_info_test.exs
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.NodeInfoTest do
@@ -7,8 +7,6 @@ defmodule Pleroma.Web.NodeInfoTest do
 
   import Pleroma.Factory
 
-  alias Pleroma.Config
-
   setup do: clear_config([:mrf_simple])
   setup do: clear_config(:instance)
 
@@ -93,7 +91,7 @@ defmodule Pleroma.Web.NodeInfoTest do
 
     assert "safe_dm_mentions" in response["metadata"]["features"]
 
-    Config.put([:instance, :safe_dm_mentions], false)
+    clear_config([:instance, :safe_dm_mentions], false)
 
     response =
       conn
@@ -107,7 +105,7 @@ defmodule Pleroma.Web.NodeInfoTest do
     setup do: clear_config([:instance, :federating])
 
     test "it shows if federation is enabled/disabled", %{conn: conn} do
-      Config.put([:instance, :federating], true)
+      clear_config([:instance, :federating], true)
 
       response =
         conn
@@ -116,7 +114,7 @@ defmodule Pleroma.Web.NodeInfoTest do
 
       assert response["metadata"]["federation"]["enabled"] == true
 
-      Config.put([:instance, :federating], false)
+      clear_config([:instance, :federating], false)
 
       response =
         conn
@@ -156,26 +154,28 @@ defmodule Pleroma.Web.NodeInfoTest do
     clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.SimplePolicy])
     clear_config([:mrf, :transparency], true)
 
-    simple_config = %{"reject" => ["example.com"]}
+    simple_config = %{"reject" => [{"example.com", ""}]}
     clear_config(:mrf_simple, simple_config)
 
+    expected_config = %{"reject" => [["example.com", ""]]}
+
     response =
       conn
       |> get("/nodeinfo/2.1.json")
       |> json_response(:ok)
 
-    assert response["metadata"]["federation"]["mrf_simple"] == simple_config
+    assert response["metadata"]["federation"]["mrf_simple"] == expected_config
   end
 
   test "it performs exclusions from MRF transparency data if configured", %{conn: conn} do
     clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.SimplePolicy])
     clear_config([:mrf, :transparency], true)
-    clear_config([:mrf, :transparency_exclusions], ["other.site"])
+    clear_config([:mrf, :transparency_exclusions], [{"other.site", "We don't want them to know"}])
 
-    simple_config = %{"reject" => ["example.com", "other.site"]}
+    simple_config = %{"reject" => [{"example.com", ""}, {"other.site", ""}]}
     clear_config(:mrf_simple, simple_config)
 
-    expected_config = %{"reject" => ["example.com"]}
+    expected_config = %{"reject" => [["example.com", ""]]}
 
     response =
       conn