Merge branch 'develop' into feature/compat/push-subscriptions

# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock

1 files changed, 33 insertions, 0 deletions

diff --git a/test/web/plugs/federating_plug_test.exs b/test/web/plugs/federating_plug_test.exs
new file mode 100644
index 000000000..1455a1c46
--- /dev/null
+++ b/test/web/plugs/federating_plug_test.exs
@@ -0,0 +1,33 @@
+defmodule Pleroma.Web.FederatingPlugTest do
+  use Pleroma.Web.ConnCase
+
+  test "returns and halt the conn when federating is disabled" do
+    instance =
+      Application.get_env(:pleroma, :instance)
+      |> Keyword.put(:federating, false)
+
+    Application.put_env(:pleroma, :instance, instance)
+
+    conn =
+      build_conn()
+      |> Pleroma.Web.FederatingPlug.call(%{})
+
+    assert conn.status == 404
+    assert conn.halted
+
+    instance =
+      Application.get_env(:pleroma, :instance)
+      |> Keyword.put(:federating, true)
+
+    Application.put_env(:pleroma, :instance, instance)
+  end
+
+  test "does nothing when federating is enabled" do
+    conn =
+      build_conn()
+      |> Pleroma.Web.FederatingPlug.call(%{})
+
+    refute conn.status
+    refute conn.halted
+  end
+end