aboutsummaryrefslogtreecommitdiff
path: root/test/web
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-07-14 19:24:39 +0000
committerkaniini <ariadne@dereferenced.org>2019-07-14 19:24:39 +0000
commit509d8058d99d7455155b6e7fad83fed28f2ae02d (patch)
tree443d91b209b67e793da420c6bcc913eff9201d59 /test/web
parent93701c3399add8af2d4a5d43b6f171d84655a533 (diff)
parent841314c2d504ad108f6a85713546b188096ad735 (diff)
downloadpleroma-509d8058d99d7455155b6e7fad83fed28f2ae02d.tar.gz
Merge branch 'security/ir-generic-containment' into 'develop'
security: IR-based generic object containment See merge request pleroma/pleroma!1417
Diffstat (limited to 'test/web')
-rw-r--r--test/web/activity_pub/transmogrifier_test.exs2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs
index b896a532b..cabe925f9 100644
--- a/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@ -416,6 +416,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
|> Map.put("attributedTo", user.ap_id)
|> Map.put("to", ["https://www.w3.org/ns/activitystreams#Public"])
|> Map.put("cc", [])
+ |> Map.put("id", user.ap_id <> "/activities/12345678")
data = Map.put(data, "object", object)
@@ -439,6 +440,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
|> Map.put("attributedTo", user.ap_id)
|> Map.put("to", nil)
|> Map.put("cc", nil)
+ |> Map.put("id", user.ap_id <> "/activities/12345678")
data = Map.put(data, "object", object)