diff options
author | eal <eal@waifu.club> | 2018-06-15 20:43:30 +0000 |
---|---|---|
committer | eal <eal@waifu.club> | 2018-06-15 20:43:30 +0000 |
commit | a938d07df1679efd78e1b7c10e149270489761f7 (patch) | |
tree | e8ac30d08497f4ed0f2c505a371ad748d776c06d /test | |
parent | 00d7d109efd3315cff7e73dfb5b3064bf0dbe25c (diff) | |
parent | 72c2915ecd0b6578d72b3c9796f4adc8cce83d86 (diff) | |
download | pleroma-a938d07df1679efd78e1b7c10e149270489761f7.tar.gz |
Merge branch 'bugfix/mastofe_thread_render' into 'develop'
lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads
See merge request pleroma/pleroma!223
Diffstat (limited to 'test')
-rw-r--r-- | test/web/mastodon_api/status_view_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs index d9a0a8a95..d28c3cbad 100644 --- a/test/web/mastodon_api/status_view_test.exs +++ b/test/web/mastodon_api/status_view_test.exs @@ -64,11 +64,11 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do status = StatusView.render("status.json", %{activity: activity}) - assert status.in_reply_to_id == note.id + assert status.in_reply_to_id == to_string(note.id) [status] = StatusView.render("index.json", %{activities: [activity], as: :activity}) - assert status.in_reply_to_id == note.id + assert status.in_reply_to_id == to_string(note.id) end test "contains mentions" do |