summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/mastodon_api_controller_test.exs
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-04-15 10:23:06 +0000
committerlambda <lain@soykaf.club>2019-04-15 10:23:06 +0000
commitf896699357fc7ba05fd539396bf22818d8bd98b4 (patch)
treec1f347618e11cf8c715d27b44367f45a4dcf3882 /test/web/mastodon_api/mastodon_api_controller_test.exs
parent8c6d5a6b4ddb6c2fc9fea9cf009a99c72260ddee (diff)
parentfd2e31af867379f15f1aed536cdfa779a50b812a (diff)
downloadpleroma-f896699357fc7ba05fd539396bf22818d8bd98b4.tar.gz
pleroma-f896699357fc7ba05fd539396bf22818d8bd98b4.zip
Merge branch 'refactor/remove-inReplyToStatusId' into 'develop'
Remove inReplyToStatusId See merge request pleroma/pleroma!1062
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
-rw-r--r--test/web/mastodon_api/mastodon_api_controller_test.exs4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index 292cd46b8..df3315022 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -342,7 +342,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
activity = Activity.get_by_id(id)
assert activity.data["context"] == replied_to.data["context"]
- assert activity.data["object"]["inReplyToStatusId"] == replied_to.id
+ assert Activity.get_in_reply_to_activity(activity).id == replied_to.id
end
test "posting a status with an invalid in_reply_to_id", %{conn: conn} do
@@ -2724,7 +2724,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
activity = Activity.get_by_id(id)
assert activity.data["object"]["inReplyTo"] == replied_to.data["object"]["id"]
- assert activity.data["object"]["inReplyToStatusId"] == replied_to.id
+ assert Activity.get_in_reply_to_activity(activity).id == replied_to.id
# Reblog from the third user
conn2 =