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

diff --git a/test/plugs/oauth_plug_test.exs b/test/plugs/oauth_plug_test.exs
deleted file mode 100644
index 9d39d3153..000000000
--- a/test/plugs/oauth_plug_test.exs
+++ /dev/null
@@ -1,80 +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.OAuthPlugTest do
-  use Pleroma.Web.ConnCase, async: true
-
-  alias Pleroma.Plugs.OAuthPlug
-  import Pleroma.Factory
-
-  @session_opts [
-    store: :cookie,
-    key: "_test",
-    signing_salt: "cooldude"
-  ]
-
-  setup %{conn: conn} do
-    user = insert(:user)
-    {:ok, %{token: token}} = Pleroma.Web.OAuth.Token.create(insert(:oauth_app), user)
-    %{user: user, token: token, conn: conn}
-  end
-
-  test "with valid token(uppercase), it assigns the user", %{conn: conn} = opts do
-    conn =
-      conn
-      |> put_req_header("authorization", "BEARER #{opts[:token]}")
-      |> OAuthPlug.call(%{})
-
-    assert conn.assigns[:user] == opts[:user]
-  end
-
-  test "with valid token(downcase), it assigns the user", %{conn: conn} = opts do
-    conn =
-      conn
-      |> put_req_header("authorization", "bearer #{opts[:token]}")
-      |> OAuthPlug.call(%{})
-
-    assert conn.assigns[:user] == opts[:user]
-  end
-
-  test "with valid token(downcase) in url parameters, it assigns the user", opts do
-    conn =
-      :get
-      |> build_conn("/?access_token=#{opts[:token]}")
-      |> put_req_header("content-type", "application/json")
-      |> fetch_query_params()
-      |> OAuthPlug.call(%{})
-
-    assert conn.assigns[:user] == opts[:user]
-  end
-
-  test "with valid token(downcase) in body parameters, it assigns the user", opts do
-    conn =
-      :post
-      |> build_conn("/api/v1/statuses", access_token: opts[:token], status: "test")
-      |> OAuthPlug.call(%{})
-
-    assert conn.assigns[:user] == opts[:user]
-  end
-
-  test "with invalid token, it not assigns the user", %{conn: conn} do
-    conn =
-      conn
-      |> put_req_header("authorization", "bearer TTTTT")
-      |> OAuthPlug.call(%{})
-
-    refute conn.assigns[:user]
-  end
-
-  test "when token is missed but token in session, it assigns the user", %{conn: conn} = opts do
-    conn =
-      conn
-      |> Plug.Session.call(Plug.Session.init(@session_opts))
-      |> fetch_session()
-      |> put_session(:oauth_token, opts[:token])
-      |> OAuthPlug.call(%{})
-
-    assert conn.assigns[:user] == opts[:user]
-  end
-end