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

diff --git a/test/web/oauth/token_test.exs b/test/web/oauth/token_test.exs
deleted file mode 100644
index c88b9cc98..000000000
--- a/test/web/oauth/token_test.exs
+++ /dev/null
@@ -1,72 +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.OAuth.TokenTest do
-  use Pleroma.DataCase
-  alias Pleroma.Repo
-  alias Pleroma.Web.OAuth.App
-  alias Pleroma.Web.OAuth.Authorization
-  alias Pleroma.Web.OAuth.Token
-
-  import Pleroma.Factory
-
-  test "exchanges a auth token for an access token, preserving `scopes`" do
-    {:ok, app} =
-      Repo.insert(
-        App.register_changeset(%App{}, %{
-          client_name: "client",
-          scopes: ["read", "write"],
-          redirect_uris: "url"
-        })
-      )
-
-    user = insert(:user)
-
-    {:ok, auth} = Authorization.create_authorization(app, user, ["read"])
-    assert auth.scopes == ["read"]
-
-    {:ok, token} = Token.exchange_token(app, auth)
-
-    assert token.app_id == app.id
-    assert token.user_id == user.id
-    assert token.scopes == auth.scopes
-    assert String.length(token.token) > 10
-    assert String.length(token.refresh_token) > 10
-
-    auth = Repo.get(Authorization, auth.id)
-    {:error, "already used"} = Token.exchange_token(app, auth)
-  end
-
-  test "deletes all tokens of a user" do
-    {:ok, app1} =
-      Repo.insert(
-        App.register_changeset(%App{}, %{
-          client_name: "client1",
-          scopes: ["scope"],
-          redirect_uris: "url"
-        })
-      )
-
-    {:ok, app2} =
-      Repo.insert(
-        App.register_changeset(%App{}, %{
-          client_name: "client2",
-          scopes: ["scope"],
-          redirect_uris: "url"
-        })
-      )
-
-    user = insert(:user)
-
-    {:ok, auth1} = Authorization.create_authorization(app1, user)
-    {:ok, auth2} = Authorization.create_authorization(app2, user)
-
-    {:ok, _token1} = Token.exchange_token(app1, auth1)
-    {:ok, _token2} = Token.exchange_token(app2, auth2)
-
-    {tokens, _} = Token.delete_user_tokens(user)
-
-    assert tokens == 2
-  end
-end