projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'split-masto-api/conversations' into 'develop'
[akkoma]
/
test
/
web
/
pleroma_api
/
controllers
/
scrobble_controller_test.exs
diff --git
a/test/web/pleroma_api/controllers/scrobble_controller_test.exs
b/test/web/pleroma_api/controllers/scrobble_controller_test.exs
index 8cbb5889e1e533e6f17db692a735ce7d6de9599a..881f8012c82bfd2bedb250217e84d43206fe8a2f 100644
(file)
--- a/
test/web/pleroma_api/controllers/scrobble_controller_test.exs
+++ b/
test/web/pleroma_api/controllers/scrobble_controller_test.exs
@@
-8,14
+8,14
@@
defmodule Pleroma.Web.PleromaAPI.ScrobbleControllerTest do
alias Pleroma.Web.CommonAPI
import Pleroma.Factory
alias Pleroma.Web.CommonAPI
import Pleroma.Factory
- describe "POST /api/v1/pleroma/
now-playing
" do
+ describe "POST /api/v1/pleroma/
scrobble
" do
test "works correctly", %{conn: conn} do
user = insert(:user)
conn =
conn
|> assign(:user, user)
test "works correctly", %{conn: conn} do
user = insert(:user)
conn =
conn
|> assign(:user, user)
- |> post("/api/v1/pleroma/
now-playing
", %{
+ |> post("/api/v1/pleroma/
scrobble
", %{
"title" => "lain radio episode 1",
"artist" => "lain",
"album" => "lain radio",
"title" => "lain radio episode 1",
"artist" => "lain",
"album" => "lain radio",
@@
-26,7
+26,7
@@
defmodule Pleroma.Web.PleromaAPI.ScrobbleControllerTest do
end
end
end
end
- describe "GET /api/v1/pleroma/accounts/:id/
now-playing
" do
+ describe "GET /api/v1/pleroma/accounts/:id/
scrobbles
" do
test "works correctly", %{conn: conn} do
user = insert(:user)
test "works correctly", %{conn: conn} do
user = insert(:user)
@@
-53,7
+53,7
@@
defmodule Pleroma.Web.PleromaAPI.ScrobbleControllerTest do
conn =
conn
conn =
conn
- |> get("/api/v1/pleroma/accounts/#{user.id}/
now-playing
")
+ |> get("/api/v1/pleroma/accounts/#{user.id}/
scrobbles
")
result = json_response(conn, 200)
result = json_response(conn, 200)