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

diff --git a/test/web/auth/authenticator_test.exs b/test/web/auth/authenticator_test.exs
deleted file mode 100644
index d54253343..000000000
--- a/test/web/auth/authenticator_test.exs
+++ /dev/null
@@ -1,42 +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.Web.Auth.AuthenticatorTest do
-  use Pleroma.Web.ConnCase
-
-  alias Pleroma.Web.Auth.Authenticator
-  import Pleroma.Factory
-
-  describe "fetch_user/1" do
-    test "returns user by name" do
-      user = insert(:user)
-      assert Authenticator.fetch_user(user.nickname) == user
-    end
-
-    test "returns user by email" do
-      user = insert(:user)
-      assert Authenticator.fetch_user(user.email) == user
-    end
-
-    test "returns nil" do
-      assert Authenticator.fetch_user("email") == nil
-    end
-  end
-
-  describe "fetch_credentials/1" do
-    test "returns name and password from authorization params" do
-      params = %{"authorization" => %{"name" => "test", "password" => "test-pass"}}
-      assert Authenticator.fetch_credentials(params) == {:ok, {"test", "test-pass"}}
-    end
-
-    test "returns name and password with grant_type 'password'" do
-      params = %{"grant_type" => "password", "username" => "test", "password" => "test-pass"}
-      assert Authenticator.fetch_credentials(params) == {:ok, {"test", "test-pass"}}
-    end
-
-    test "returns error" do
-      assert Authenticator.fetch_credentials(%{}) == {:error, :invalid_credentials}
-    end
-  end
-end