Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

[akkoma] / test / web / pleroma_api / controllers / chat_controller_test.exs

diff --git a/test/web/pleroma_api/controllers/chat_controller_test.exs b/test/web/pleroma_api/controllers/chat_controller_test.exs
index 0750c7273a5d5435620c3311a018522d4e3774ff..b1044574b91be3a20466dffa7ae9d267b476fa7e 100644 (file)
--- a/test/web/pleroma_api/controllers/chat_controller_test.exs
+++ b/test/web/pleroma_api/controllers/chat_controller_test.exs
@@ -19,8 +19,9 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
 
       result =
         conn
+        |> put_req_header("content-type", "application/json")
         |> post("/api/v1/pleroma/chats/#{chat.id}/messages", %{"content" => "Hallo!!"})
-        |> json_response(200)
+        |> json_response_and_validate_schema(200)
 
       assert result["content"] == "Hallo!!"
       assert result["chat_id"] == chat.id |> to_string()
@@ -42,14 +43,14 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
       result =
         conn
         |> get("/api/v1/pleroma/chats/#{chat.id}/messages")
-        |> json_response(200)
+        |> json_response_and_validate_schema(200)
 
       assert length(result) == 20
 
       result =
         conn
-        |> get("/api/v1/pleroma/chats/#{chat.id}/messages", %{"max_id" => List.last(result)["id"]})
-        |> json_response(200)
+        |> get("/api/v1/pleroma/chats/#{chat.id}/messages?max_id=#{List.last(result)["id"]}")
+        |> json_response_and_validate_schema(200)
 
       assert length(result) == 10
     end
@@ -68,7 +69,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
       result =
         conn
         |> get("/api/v1/pleroma/chats/#{chat.id}/messages")
-        |> json_response(200)
+        |> json_response_and_validate_schema(200)
 
       result
       |> Enum.each(fn message ->
@@ -87,7 +88,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
     end
   end
 
-  describe "POST /api/v1/pleroma/chats/by-ap-id/:id" do
+  describe "POST /api/v1/pleroma/chats/by-account-id/:id" do
     setup do: oauth_access(["write:statuses"])
 
     test "it creates or returns a chat", %{conn: conn} do
@@ -95,8 +96,8 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
 
       result =
         conn
-        |> post("/api/v1/pleroma/chats/by-ap-id/#{URI.encode_www_form(other_user.ap_id)}")
-        |> json_response(200)
+        |> post("/api/v1/pleroma/chats/by-account-id/#{other_user.id}")
+        |> json_response_and_validate_schema(200)
 
       assert result["id"]
     end
@@ -114,14 +115,14 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
       result =
         conn
         |> get("/api/v1/pleroma/chats")
-        |> json_response(200)
+        |> json_response_and_validate_schema(200)
 
       assert length(result) == 20
 
       result =
         conn
-        |> get("/api/v1/pleroma/chats", %{max_id: List.last(result)["id"]})
-        |> json_response(200)
+        |> get("/api/v1/pleroma/chats?max_id=#{List.last(result)["id"]}")
+        |> json_response_and_validate_schema(200)
 
       assert length(result) == 10
     end
@@ -145,7 +146,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
       result =
         conn
         |> get("/api/v1/pleroma/chats")
-        |> json_response(200)
+        |> json_response_and_validate_schema(200)
 
       ids = Enum.map(result, & &1["id"])