moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
lain 2020-06-04 19:24:07 +02:00
parent 56dfa0e0fb 9a53f619e0
commit 74edd4f391
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/chat_message_reference_test.exs
View File

@ -2,7 +2,7 @@
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only # SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.ChatMessageReferencTest do defmodule Pleroma.ChatMessageReferenceTest do
use Pleroma.DataCase, async: true use Pleroma.DataCase, async: true
alias Pleroma.Chat alias Pleroma.Chat

2
test/web/activity_pub/transmogrifier/chat_message_test.exs
View File

@ -13,7 +13,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.ChatMessageTest do
alias Pleroma.Web.ActivityPub.Transmogrifier alias Pleroma.Web.ActivityPub.Transmogrifier
describe "handle_incoming" do describe "handle_incoming" do
test "handles this" do test "handles chonks with attachment" do
data = %{ data = %{
"@context" => "https://www.w3.org/ns/activitystreams", "@context" => "https://www.w3.org/ns/activitystreams",
"actor" => "https://honk.tedunangst.com/u/tedu", "actor" => "https://honk.tedunangst.com/u/tedu",