Merge remote-tracking branch 'upstream/develop' into aliases

1 files changed, 0 insertions, 60 deletions

diff --git a/test/web/pleroma_api/controllers/scrobble_controller_test.exs b/test/web/pleroma_api/controllers/scrobble_controller_test.exs
deleted file mode 100644
index f39c07ac6..000000000
--- a/test/web/pleroma_api/controllers/scrobble_controller_test.exs
+++ /dev/null
@@ -1,60 +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.PleromaAPI.ScrobbleControllerTest do
-  use Pleroma.Web.ConnCase
-
-  alias Pleroma.Web.CommonAPI
-
-  describe "POST /api/v1/pleroma/scrobble" do
-    test "works correctly" do
-      %{conn: conn} = oauth_access(["write"])
-
-      conn =
-        conn
-        |> put_req_header("content-type", "application/json")
-        |> post("/api/v1/pleroma/scrobble", %{
-          "title" => "lain radio episode 1",
-          "artist" => "lain",
-          "album" => "lain radio",
-          "length" => "180000"
-        })
-
-      assert %{"title" => "lain radio episode 1"} = json_response_and_validate_schema(conn, 200)
-    end
-  end
-
-  describe "GET /api/v1/pleroma/accounts/:id/scrobbles" do
-    test "works correctly" do
-      %{user: user, conn: conn} = oauth_access(["read"])
-
-      {:ok, _activity} =
-        CommonAPI.listen(user, %{
-          title: "lain radio episode 1",
-          artist: "lain",
-          album: "lain radio"
-        })
-
-      {:ok, _activity} =
-        CommonAPI.listen(user, %{
-          title: "lain radio episode 2",
-          artist: "lain",
-          album: "lain radio"
-        })
-
-      {:ok, _activity} =
-        CommonAPI.listen(user, %{
-          title: "lain radio episode 3",
-          artist: "lain",
-          album: "lain radio"
-        })
-
-      conn = get(conn, "/api/v1/pleroma/accounts/#{user.id}/scrobbles")
-
-      result = json_response_and_validate_schema(conn, 200)
-
-      assert length(result) == 3
-    end
-  end
-end