summaryrefslogtreecommitdiff
path: root/test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2021-08-08 14:37:15 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2021-08-08 14:37:15 +0000
commitdc63aaf84f07a6f8042f43617d8ec356fed85cec (patch)
tree5d12a05bce5dc1a23736fd37e7ca8c64580acd34 /test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs
parentb221d77a6da07c684bdbc63ddf4500e0d7ffeae8 (diff)
parent0910777d41f8b4b3096c35c5fc97fc357e5d8c8c (diff)
Merge branch 'release/2.4.0' into 'stable'v2.4.0
Release/2.4.0 See merge request pleroma/pleroma!3493
Diffstat (limited to 'test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs')
-rw-r--r--test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs
index 3176f1296..00797a9ea 100644
--- a/test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs
@@ -214,7 +214,8 @@ defmodule Pleroma.Web.MastodonAPI.ConversationControllerTest do
res_conn = get(conn, "/api/v1/statuses/#{direct.id}/context")
- assert %{"ancestors" => [], "descendants" => []} == json_response(res_conn, 200)
+ assert %{"ancestors" => [], "descendants" => []} ==
+ json_response_and_validate_schema(res_conn, 200)
end
test "Removes a conversation", %{user: user_one, conn: conn} do