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, 41 deletions

diff --git a/test/plugs/user_fetcher_plug_test.exs b/test/plugs/user_fetcher_plug_test.exs
deleted file mode 100644
index 0496f14dd..000000000
--- a/test/plugs/user_fetcher_plug_test.exs
+++ /dev/null
@@ -1,41 +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.UserFetcherPlugTest do
-  use Pleroma.Web.ConnCase, async: true
-
-  alias Pleroma.Plugs.UserFetcherPlug
-  import Pleroma.Factory
-
-  setup do
-    user = insert(:user)
-    %{user: user}
-  end
-
-  test "if an auth_credentials assign is present, it tries to fetch the user and assigns it", %{
-    conn: conn,
-    user: user
-  } do
-    conn =
-      conn
-      |> assign(:auth_credentials, %{
-        username: user.nickname,
-        password: nil
-      })
-
-    conn =
-      conn
-      |> UserFetcherPlug.call(%{})
-
-    assert conn.assigns[:auth_user] == user
-  end
-
-  test "without a credential assign it doesn't do anything", %{conn: conn} do
-    ret_conn =
-      conn
-      |> UserFetcherPlug.call(%{})
-
-    assert conn == ret_conn
-  end
-end