X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fpleroma_api%2Fcontrollers%2Fscrobble_controller_test.exs;h=2242610f15db39a8199bd825366fe3eb9b944ef6;hb=209e4d8432bdac4cf3a7f6eff258641e5fc037e5;hp=8cbb5889e1e533e6f17db692a735ce7d6de9599a;hpb=7cad6ea67a47df2776a15dd69b9e408c517800e6;p=akkoma

diff --git a/test/web/pleroma_api/controllers/scrobble_controller_test.exs b/test/web/pleroma_api/controllers/scrobble_controller_test.exs
index 8cbb5889e..2242610f1 100644
--- a/test/web/pleroma_api/controllers/scrobble_controller_test.exs
+++ b/test/web/pleroma_api/controllers/scrobble_controller_test.exs
@@ -6,16 +6,13 @@ defmodule Pleroma.Web.PleromaAPI.ScrobbleControllerTest do
   use Pleroma.Web.ConnCase
 
   alias Pleroma.Web.CommonAPI
-  import Pleroma.Factory
 
-  describe "POST /api/v1/pleroma/now-playing" do
-    test "works correctly", %{conn: conn} do
-      user = insert(:user)
+  describe "POST /api/v1/pleroma/scrobble" do
+    test "works correctly" do
+      %{conn: conn} = oauth_access(["write"])
 
       conn =
-        conn
-        |> assign(:user, user)
-        |> post("/api/v1/pleroma/now-playing", %{
+        post(conn, "/api/v1/pleroma/scrobble", %{
           "title" => "lain radio episode 1",
           "artist" => "lain",
           "album" => "lain radio",
@@ -26,9 +23,9 @@ defmodule Pleroma.Web.PleromaAPI.ScrobbleControllerTest do
     end
   end
 
-  describe "GET /api/v1/pleroma/accounts/:id/now-playing" do
-    test "works correctly", %{conn: conn} do
-      user = insert(:user)
+  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, %{
@@ -51,9 +48,7 @@ defmodule Pleroma.Web.PleromaAPI.ScrobbleControllerTest do
           "album" => "lain radio"
         })
 
-      conn =
-        conn
-        |> get("/api/v1/pleroma/accounts/#{user.id}/now-playing")
+      conn = get(conn, "/api/v1/pleroma/accounts/#{user.id}/scrobbles")
 
       result = json_response(conn, 200)