summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/mastodon_api_controller_test.exs
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-09-22 16:58:39 +0300
committerMaxim Filippov <colixer@gmail.com>2019-09-22 16:58:39 +0300
commit02bbcd6180702828b08a37ccf214cc3b7d5ebd24 (patch)
tree73ce407b898050eeb08352ca1e8368918d1ba2bc /test/web/mastodon_api/mastodon_api_controller_test.exs
parentf89fe3ac06505cc07372fcdefdc3fde72d1f04a0 (diff)
parent472e7b796cfeb1445ee1572df414531655b050ce (diff)
downloadpleroma-02bbcd6180702828b08a37ccf214cc3b7d5ebd24.tar.gz
pleroma-02bbcd6180702828b08a37ccf214cc3b7d5ebd24.zip
Merge branch 'develop' into feature/return-link-for-password-reset
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]