Merge remote-tracking branch 'upstream/develop' into registration-workflow

1 files changed, 0 insertions, 74 deletions

diff --git a/test/web/mastodon_api/controllers/follow_request_controller_test.exs b/test/web/mastodon_api/controllers/follow_request_controller_test.exs
deleted file mode 100644
index 6749e0e83..000000000
--- a/test/web/mastodon_api/controllers/follow_request_controller_test.exs
+++ /dev/null
@@ -1,74 +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.MastodonAPI.FollowRequestControllerTest do
-  use Pleroma.Web.ConnCase
-
-  alias Pleroma.User
-  alias Pleroma.Web.CommonAPI
-
-  import Pleroma.Factory
-
-  describe "locked accounts" do
-    setup do
-      user = insert(:user, locked: true)
-      %{conn: conn} = oauth_access(["follow"], user: user)
-      %{user: user, conn: conn}
-    end
-
-    test "/api/v1/follow_requests works", %{user: user, conn: conn} do
-      other_user = insert(:user)
-
-      {:ok, _, _, _activity} = CommonAPI.follow(other_user, user)
-      {:ok, other_user} = User.follow(other_user, user, :follow_pending)
-
-      assert User.following?(other_user, user) == false
-
-      conn = get(conn, "/api/v1/follow_requests")
-
-      assert [relationship] = json_response_and_validate_schema(conn, 200)
-      assert to_string(other_user.id) == relationship["id"]
-    end
-
-    test "/api/v1/follow_requests/:id/authorize works", %{user: user, conn: conn} do
-      other_user = insert(:user)
-
-      {:ok, _, _, _activity} = CommonAPI.follow(other_user, user)
-      {:ok, other_user} = User.follow(other_user, user, :follow_pending)
-
-      user = User.get_cached_by_id(user.id)
-      other_user = User.get_cached_by_id(other_user.id)
-
-      assert User.following?(other_user, user) == false
-
-      conn = post(conn, "/api/v1/follow_requests/#{other_user.id}/authorize")
-
-      assert relationship = json_response_and_validate_schema(conn, 200)
-      assert to_string(other_user.id) == relationship["id"]
-
-      user = User.get_cached_by_id(user.id)
-      other_user = User.get_cached_by_id(other_user.id)
-
-      assert User.following?(other_user, user) == true
-    end
-
-    test "/api/v1/follow_requests/:id/reject works", %{user: user, conn: conn} do
-      other_user = insert(:user)
-
-      {:ok, _, _, _activity} = CommonAPI.follow(other_user, user)
-
-      user = User.get_cached_by_id(user.id)
-
-      conn = post(conn, "/api/v1/follow_requests/#{other_user.id}/reject")
-
-      assert relationship = json_response_and_validate_schema(conn, 200)
-      assert to_string(other_user.id) == relationship["id"]
-
-      user = User.get_cached_by_id(user.id)
-      other_user = User.get_cached_by_id(other_user.id)
-
-      assert User.following?(other_user, user) == false
-    end
-  end
-end