alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'chat-moderation-stable' into chat-moderation

This commit is contained in:
Alex Gleason 2020-09-11 14:30:28 -05:00
parent 9733c9d065 bc86d0a906
commit c4061f06ba
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/web/admin_api/controllers/chat_controller_test.exs
View File

@ -149,7 +149,11 @@ test "it returns a chat", %{conn: conn} do
%{conn: conn, chat: chat, cm_ref: cm_ref} %{conn: conn, chat: chat, cm_ref: cm_ref}
end end
test "DELETE /api/pleroma/admin/chats/:id/messages/:message_id", %{conn: conn, chat: chat, cm_ref: cm_ref} do test "DELETE /api/pleroma/admin/chats/:id/messages/:message_id", %{
conn: conn,
chat: chat,
cm_ref: cm_ref
} do
conn conn
|> put_req_header("content-type", "application/json") |> put_req_header("content-type", "application/json")
|> delete("/api/pleroma/admin/chats/#{chat.id}/messages/#{cm_ref.id}") |> delete("/api/pleroma/admin/chats/#{chat.id}/messages/#{cm_ref.id}")
@ -184,7 +188,11 @@ test "GET /api/pleroma/admin/chats/:id", %{conn: conn, chat: chat} do
%{conn: build_conn(), chat: chat, cm_ref: cm_ref} %{conn: build_conn(), chat: chat, cm_ref: cm_ref}
end end
test "DELETE /api/pleroma/admin/chats/:id/messages/:message_id", %{conn: conn, chat: chat, cm_ref: cm_ref} do test "DELETE /api/pleroma/admin/chats/:id/messages/:message_id", %{
conn: conn,
chat: chat,
cm_ref: cm_ref
} do
conn conn
|> put_req_header("content-type", "application/json") |> put_req_header("content-type", "application/json")
|> delete("/api/pleroma/admin/chats/#{chat.id}/messages/#{cm_ref.id}") |> delete("/api/pleroma/admin/chats/#{chat.id}/messages/#{cm_ref.id}")
@ -205,5 +213,4 @@ test "GET /api/pleroma/admin/chats/:id", %{conn: conn, chat: chat} do
|> json_response(403) |> json_response(403)
end end
end end
end end