projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change user.discoverable field to user.is_discoverable
[akkoma]
/
test
/
web
/
admin_api
/
controllers
/
chat_controller_test.exs
diff --git
a/test/web/admin_api/controllers/chat_controller_test.exs
b/test/web/admin_api/controllers/chat_controller_test.exs
index ccca3521ad8b0ceacfee11acf706f0d6ee97d3df..bd4c9c9d15d0a30f5e3474c41b9b9cac99a17d5a 100644
(file)
--- a/
test/web/admin_api/controllers/chat_controller_test.exs
+++ b/
test/web/admin_api/controllers/chat_controller_test.exs
@@
-40,8
+40,10
@@
defmodule Pleroma.Web.AdminAPI.ChatControllerTest do
object = Object.normalize(message, false)
chat = Chat.get(user.id, recipient.ap_id)
object = Object.normalize(message, false)
chat = Chat.get(user.id, recipient.ap_id)
+ recipient_chat = Chat.get(recipient.id, user.ap_id)
cm_ref = MessageReference.for_chat_and_object(chat, object)
cm_ref = MessageReference.for_chat_and_object(chat, object)
+ recipient_cm_ref = MessageReference.for_chat_and_object(recipient_chat, object)
result =
conn
result =
conn
@@
-56,6
+58,7
@@
defmodule Pleroma.Web.AdminAPI.ChatControllerTest do
assert result["id"] == cm_ref.id
refute MessageReference.get_by_id(cm_ref.id)
assert result["id"] == cm_ref.id
refute MessageReference.get_by_id(cm_ref.id)
+ refute MessageReference.get_by_id(recipient_cm_ref.id)
assert %{data: %{"type" => "Tombstone"}} = Object.get_by_id(object.id)
end
end
assert %{data: %{"type" => "Tombstone"}} = Object.get_by_id(object.id)
end
end
@@
-149,7
+152,11
@@
defmodule Pleroma.Web.AdminAPI.ChatControllerTest do
%{conn: conn, chat: chat, cm_ref: cm_ref}
end
%{conn: conn, chat: chat, cm_ref: cm_ref}
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
|> put_req_header("content-type", "application/json")
|> delete("/api/pleroma/admin/chats/#{chat.id}/messages/#{cm_ref.id}")
conn
|> put_req_header("content-type", "application/json")
|> delete("/api/pleroma/admin/chats/#{chat.id}/messages/#{cm_ref.id}")
@@
-184,7
+191,11
@@
defmodule Pleroma.Web.AdminAPI.ChatControllerTest do
%{conn: build_conn(), chat: chat, cm_ref: cm_ref}
end
%{conn: build_conn(), chat: chat, cm_ref: cm_ref}
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
|> put_req_header("content-type", "application/json")
|> delete("/api/pleroma/admin/chats/#{chat.id}/messages/#{cm_ref.id}")
conn
|> put_req_header("content-type", "application/json")
|> delete("/api/pleroma/admin/chats/#{chat.id}/messages/#{cm_ref.id}")
@@
-205,5
+216,4
@@
defmodule Pleroma.Web.AdminAPI.ChatControllerTest do
|> json_response(403)
end
end
|> json_response(403)
end
end
-
end
end