Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 31 insertions, 0 deletions

diff --git a/test/pleroma/web/plugs/federating_plug_test.exs b/test/pleroma/web/plugs/federating_plug_test.exs
new file mode 100644
index 000000000..a4652f6c5
--- /dev/null
+++ b/test/pleroma/web/plugs/federating_plug_test.exs
@@ -0,0 +1,31 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.Plugs.FederatingPlugTest do
+  use Pleroma.Web.ConnCase
+
+  setup do: clear_config([:instance, :federating])
+
+  test "returns and halt the conn when federating is disabled" do
+    Pleroma.Config.put([:instance, :federating], false)
+
+    conn =
+      build_conn()
+      |> Pleroma.Web.Plugs.FederatingPlug.call(%{})
+
+    assert conn.status == 404
+    assert conn.halted
+  end
+
+  test "does nothing when federating is enabled" do
+    Pleroma.Config.put([:instance, :federating], true)
+
+    conn =
+      build_conn()
+      |> Pleroma.Web.Plugs.FederatingPlug.call(%{})
+
+    refute conn.status
+    refute conn.halted
+  end
+end