Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

1 files changed, 0 insertions, 48 deletions

diff --git a/test/plugs/ensure_public_or_authenticated_plug_test.exs b/test/plugs/ensure_public_or_authenticated_plug_test.exs
deleted file mode 100644
index fc2934369..000000000
--- a/test/plugs/ensure_public_or_authenticated_plug_test.exs
+++ /dev/null
@@ -1,48 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Plugs.EnsurePublicOrAuthenticatedPlugTest do
-  use Pleroma.Web.ConnCase, async: true
-
-  alias Pleroma.Config
-  alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
-  alias Pleroma.User
-
-  setup do: clear_config([:instance, :public])
-
-  test "it halts if not public and no user is assigned", %{conn: conn} do
-    Config.put([:instance, :public], false)
-
-    conn =
-      conn
-      |> EnsurePublicOrAuthenticatedPlug.call(%{})
-
-    assert conn.status == 403
-    assert conn.halted == true
-  end
-
-  test "it continues if public", %{conn: conn} do
-    Config.put([:instance, :public], true)
-
-    ret_conn =
-      conn
-      |> EnsurePublicOrAuthenticatedPlug.call(%{})
-
-    refute ret_conn.halted
-  end
-
-  test "it continues if a user is assigned, even if not public", %{conn: conn} do
-    Config.put([:instance, :public], false)
-
-    conn =
-      conn
-      |> assign(:user, %User{})
-
-    ret_conn =
-      conn
-      |> EnsurePublicOrAuthenticatedPlug.call(%{})
-
-    refute ret_conn.halted
-  end
-end