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

diff --git a/test/web/oauth/app_test.exs b/test/web/oauth/app_test.exs
deleted file mode 100644
index 993a490e0..000000000
--- a/test/web/oauth/app_test.exs
+++ /dev/null
@@ -1,44 +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.AppTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Web.OAuth.App
-  import Pleroma.Factory
-
-  describe "get_or_make/2" do
-    test "gets exist app" do
-      attrs = %{client_name: "Mastodon-Local", redirect_uris: "."}
-      app = insert(:oauth_app, Map.merge(attrs, %{scopes: ["read", "write"]}))
-      {:ok, %App{} = exist_app} = App.get_or_make(attrs, [])
-      assert exist_app == app
-    end
-
-    test "make app" do
-      attrs = %{client_name: "Mastodon-Local", redirect_uris: "."}
-      {:ok, %App{} = app} = App.get_or_make(attrs, ["write"])
-      assert app.scopes == ["write"]
-    end
-
-    test "gets exist app and updates scopes" do
-      attrs = %{client_name: "Mastodon-Local", redirect_uris: "."}
-      app = insert(:oauth_app, Map.merge(attrs, %{scopes: ["read", "write"]}))
-      {:ok, %App{} = exist_app} = App.get_or_make(attrs, ["read", "write", "follow", "push"])
-      assert exist_app.id == app.id
-      assert exist_app.scopes == ["read", "write", "follow", "push"]
-    end
-
-    test "has unique client_id" do
-      insert(:oauth_app, client_name: "", redirect_uris: "", client_id: "boop")
-
-      error =
-        catch_error(insert(:oauth_app, client_name: "", redirect_uris: "", client_id: "boop"))
-
-      assert %Ecto.ConstraintError{} = error
-      assert error.constraint == "apps_client_id_index"
-      assert error.type == :unique
-    end
-  end
-end