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

diff --git a/test/web/mastodon_api/controllers/list_controller_test.exs b/test/web/mastodon_api/controllers/list_controller_test.exs
deleted file mode 100644
index 091ec006c..000000000
--- a/test/web/mastodon_api/controllers/list_controller_test.exs
+++ /dev/null
@@ -1,176 +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.ListControllerTest do
-  use Pleroma.Web.ConnCase
-
-  alias Pleroma.Repo
-
-  import Pleroma.Factory
-
-  test "creating a list" do
-    %{conn: conn} = oauth_access(["write:lists"])
-
-    assert %{"title" => "cuties"} =
-             conn
-             |> put_req_header("content-type", "application/json")
-             |> post("/api/v1/lists", %{"title" => "cuties"})
-             |> json_response_and_validate_schema(:ok)
-  end
-
-  test "renders error for invalid params" do
-    %{conn: conn} = oauth_access(["write:lists"])
-
-    conn =
-      conn
-      |> put_req_header("content-type", "application/json")
-      |> post("/api/v1/lists", %{"title" => nil})
-
-    assert %{"error" => "title - null value where string expected."} =
-             json_response_and_validate_schema(conn, 400)
-  end
-
-  test "listing a user's lists" do
-    %{conn: conn} = oauth_access(["read:lists", "write:lists"])
-
-    conn
-    |> put_req_header("content-type", "application/json")
-    |> post("/api/v1/lists", %{"title" => "cuties"})
-    |> json_response_and_validate_schema(:ok)
-
-    conn
-    |> put_req_header("content-type", "application/json")
-    |> post("/api/v1/lists", %{"title" => "cofe"})
-    |> json_response_and_validate_schema(:ok)
-
-    conn = get(conn, "/api/v1/lists")
-
-    assert [
-             %{"id" => _, "title" => "cofe"},
-             %{"id" => _, "title" => "cuties"}
-           ] = json_response_and_validate_schema(conn, :ok)
-  end
-
-  test "adding users to a list" do
-    %{user: user, conn: conn} = oauth_access(["write:lists"])
-    other_user = insert(:user)
-    {:ok, list} = Pleroma.List.create("name", user)
-
-    assert %{} ==
-             conn
-             |> put_req_header("content-type", "application/json")
-             |> post("/api/v1/lists/#{list.id}/accounts", %{"account_ids" => [other_user.id]})
-             |> json_response_and_validate_schema(:ok)
-
-    %Pleroma.List{following: following} = Pleroma.List.get(list.id, user)
-    assert following == [other_user.follower_address]
-  end
-
-  test "removing users from a list, body params" do
-    %{user: user, conn: conn} = oauth_access(["write:lists"])
-    other_user = insert(:user)
-    third_user = insert(:user)
-    {:ok, list} = Pleroma.List.create("name", user)
-    {:ok, list} = Pleroma.List.follow(list, other_user)
-    {:ok, list} = Pleroma.List.follow(list, third_user)
-
-    assert %{} ==
-             conn
-             |> put_req_header("content-type", "application/json")
-             |> delete("/api/v1/lists/#{list.id}/accounts", %{"account_ids" => [other_user.id]})
-             |> json_response_and_validate_schema(:ok)
-
-    %Pleroma.List{following: following} = Pleroma.List.get(list.id, user)
-    assert following == [third_user.follower_address]
-  end
-
-  test "removing users from a list, query params" do
-    %{user: user, conn: conn} = oauth_access(["write:lists"])
-    other_user = insert(:user)
-    third_user = insert(:user)
-    {:ok, list} = Pleroma.List.create("name", user)
-    {:ok, list} = Pleroma.List.follow(list, other_user)
-    {:ok, list} = Pleroma.List.follow(list, third_user)
-
-    assert %{} ==
-             conn
-             |> put_req_header("content-type", "application/json")
-             |> delete("/api/v1/lists/#{list.id}/accounts?account_ids[]=#{other_user.id}")
-             |> json_response_and_validate_schema(:ok)
-
-    %Pleroma.List{following: following} = Pleroma.List.get(list.id, user)
-    assert following == [third_user.follower_address]
-  end
-
-  test "listing users in a list" do
-    %{user: user, conn: conn} = oauth_access(["read:lists"])
-    other_user = insert(:user)
-    {:ok, list} = Pleroma.List.create("name", user)
-    {:ok, list} = Pleroma.List.follow(list, other_user)
-
-    conn =
-      conn
-      |> assign(:user, user)
-      |> get("/api/v1/lists/#{list.id}/accounts", %{"account_ids" => [other_user.id]})
-
-    assert [%{"id" => id}] = json_response_and_validate_schema(conn, 200)
-    assert id == to_string(other_user.id)
-  end
-
-  test "retrieving a list" do
-    %{user: user, conn: conn} = oauth_access(["read:lists"])
-    {:ok, list} = Pleroma.List.create("name", user)
-
-    conn =
-      conn
-      |> assign(:user, user)
-      |> get("/api/v1/lists/#{list.id}")
-
-    assert %{"id" => id} = json_response_and_validate_schema(conn, 200)
-    assert id == to_string(list.id)
-  end
-
-  test "renders 404 if list is not found" do
-    %{conn: conn} = oauth_access(["read:lists"])
-
-    conn = get(conn, "/api/v1/lists/666")
-
-    assert %{"error" => "List not found"} = json_response_and_validate_schema(conn, :not_found)
-  end
-
-  test "renaming a list" do
-    %{user: user, conn: conn} = oauth_access(["write:lists"])
-    {:ok, list} = Pleroma.List.create("name", user)
-
-    assert %{"title" => "newname"} =
-             conn
-             |> put_req_header("content-type", "application/json")
-             |> put("/api/v1/lists/#{list.id}", %{"title" => "newname"})
-             |> json_response_and_validate_schema(:ok)
-  end
-
-  test "validates title when renaming a list" do
-    %{user: user, conn: conn} = oauth_access(["write:lists"])
-    {:ok, list} = Pleroma.List.create("name", user)
-
-    conn =
-      conn
-      |> assign(:user, user)
-      |> put_req_header("content-type", "application/json")
-      |> put("/api/v1/lists/#{list.id}", %{"title" => "  "})
-
-    assert %{"error" => "can't be blank"} ==
-             json_response_and_validate_schema(conn, :unprocessable_entity)
-  end
-
-  test "deleting a list" do
-    %{user: user, conn: conn} = oauth_access(["write:lists"])
-    {:ok, list} = Pleroma.List.create("name", user)
-
-    conn = delete(conn, "/api/v1/lists/#{list.id}")
-
-    assert %{} = json_response_and_validate_schema(conn, 200)
-    assert is_nil(Repo.get(Pleroma.List, list.id))
-  end
-end