summaryrefslogtreecommitdiff
path: root/test/web
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-02-23 15:00:41 +0100
committerlain <lain@soykaf.club>2018-02-23 15:00:41 +0100
commitaa79d64e0d278e30cb05cc3145a9539ea684bc6f (patch)
tree2297611c109b01905f0182a37710698b693fe290 /test/web
parent2583a9f6e85dcc83940c763f83bea6a48c6d3528 (diff)
downloadpleroma-aa79d64e0d278e30cb05cc3145a9539ea684bc6f.tar.gz
pleroma-aa79d64e0d278e30cb05cc3145a9539ea684bc6f.zip
Correctly stitch mastodon -> ostatus replies.
Diffstat (limited to 'test/web')
-rw-r--r--test/web/activity_pub/activity_pub_test.exs8
-rw-r--r--test/web/activity_pub/transmogrifier_test.exs5
2 files changed, 8 insertions, 5 deletions
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index 4aeabc596..8a7f328c3 100644
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -288,6 +288,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
assert object == object_again
end
+
+ test "it correctly stitches up conversations between ostatus and ap" do
+ last = "https://mstdn.io/users/mayuutann/statuses/99568293732299394"
+ {:ok, object} = ActivityPub.fetch_object_from_id(last)
+
+ object = Object.get_by_ap_id(object.data["inReplyTo"])
+ assert object
+ end
end
describe "following / unfollowing" do
diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs
index 4d800992a..e3a170e4e 100644
--- a/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@ -10,11 +10,6 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
alias Pleroma.Web.CommonAPI
describe "handle_incoming" do
-
- test "it correctly connects AP and non-AP statuses" do
- last = "https://mstdn.io/users/mayuutann/statuses/99568293732299394"
- end
-
test "it ignores an incoming notice if we already have it" do
activity = insert(:note_activity)