summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/mastodon_api_controller_test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-09-23 21:32:50 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-09-23 21:32:50 +0300
commit38245f13367cdc2df29ff2a499418e526b654fb5 (patch)
tree514724023f061f56e42fcaa7ae79f07d3d055c58 /test/web/mastodon_api/mastodon_api_controller_test.exs
parentd4ed3a35b8aa34cd968113970bbab445eb251703 (diff)
parentfd48bd80eb7eab563c25586b1deba2ed42c02c5a (diff)
downloadpleroma-38245f13367cdc2df29ff2a499418e526b654fb5.tar.gz
pleroma-38245f13367cdc2df29ff2a499418e526b654fb5.zip
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
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, 3 insertions, 1 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index fb04748bb..35a0d3fe1 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -296,7 +296,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
conn
|> post("api/v1/statuses", %{"status" => content, "visibility" => "direct"})
- assert %{"id" => id, "visibility" => "direct"} = json_response(conn, 200)
+ assert %{"id" => id} = response = json_response(conn, 200)
+ assert response["visibility"] == "direct"
+ assert response["pleroma"]["direct_conversation_id"]
assert activity = Activity.get_by_id(id)
assert activity.recipients == [user2.ap_id, conn.assigns[:user].ap_id]
assert activity.data["to"] == [user2.ap_id]