summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/mastodon_api_controller_test.exs
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-01-25 10:40:51 +0300
committerrinpatch <rinpatch@sdf.org>2019-01-25 10:40:51 +0300
commit3a5b3c5a3aca6886b96afb7d12628be6d42e427a (patch)
tree48e376b83da9c1f221a9eb2817025e264cf08318 /test/web/mastodon_api/mastodon_api_controller_test.exs
parentc9b418e5477229017b3750c55cf3ea3d03b7e609 (diff)
parent4c99b6d35abe2beb184a12f7cba6f84a0fc6a27a (diff)
downloadpleroma-3a5b3c5a3aca6886b96afb7d12628be6d42e427a.tar.gz
pleroma-3a5b3c5a3aca6886b96afb7d12628be6d42e427a.zip
Merge remote-tracking branch 'pl/develop' into oembed_provider
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
-rw-r--r--test/web/mastodon_api/mastodon_api_controller_test.exs12
1 files changed, 11 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 8443dc856..6004285d6 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -148,7 +148,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert %{"id" => id, "visibility" => "direct"} = json_response(conn, 200)
assert activity = Repo.get(Activity, id)
- assert activity.recipients == [user2.ap_id]
+ assert activity.recipients == [user2.ap_id, user1.ap_id]
assert activity.data["to"] == [user2.ap_id]
assert activity.data["cc"] == []
end
@@ -182,6 +182,16 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert %{"visibility" => "direct"} = status
assert status["url"] != direct.data["id"]
+ # User should be able to see his own direct message
+ res_conn =
+ build_conn()
+ |> assign(:user, user_one)
+ |> get("api/v1/timelines/direct")
+
+ [status] = json_response(res_conn, 200)
+
+ assert %{"visibility" => "direct"} = status
+
# Both should be visible here
res_conn =
conn