summaryrefslogtreecommitdiff
path: root/test/web/activity_pub
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-09-25 10:48:01 -0500
committerMark Felder <feld@FreeBSD.org>2020-09-25 10:48:01 -0500
commit2bf2c68dee1385cba906fe95bd2af3afd2a341b9 (patch)
treed9c1fed6298705d59c5108d52e452922fbdd699b /test/web/activity_pub
parent88653c01c92fffb396e32edad203d18607980c04 (diff)
parent5cd71208d9b273535f978559011377e703e82dcb (diff)
downloadpleroma-2bf2c68dee1385cba906fe95bd2af3afd2a341b9.tar.gz
pleroma-2bf2c68dee1385cba906fe95bd2af3afd2a341b9.zip
Merge branch 'develop' into fix/deprecation-warning-welcome-message
Diffstat (limited to 'test/web/activity_pub')
-rw-r--r--test/web/activity_pub/transmogrifier/question_handling_test.exs4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/activity_pub/transmogrifier/question_handling_test.exs b/test/web/activity_pub/transmogrifier/question_handling_test.exs
index 74ee79543..d2822ce75 100644
--- a/test/web/activity_pub/transmogrifier/question_handling_test.exs
+++ b/test/web/activity_pub/transmogrifier/question_handling_test.exs
@@ -157,12 +157,12 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.QuestionHandlingTest do
}
end
- test "returns an error if received a second time" do
+ test "returns same activity if received a second time" do
data = File.read!("test/fixtures/mastodon-question-activity.json") |> Poison.decode!()
assert {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
- assert {:error, {:validate_object, {:error, _}}} = Transmogrifier.handle_incoming(data)
+ assert {:ok, ^activity} = Transmogrifier.handle_incoming(data)
end
test "accepts a Question with no content" do