diff options
author | Alex Gleason <alex@alexgleason.me> | 2020-04-20 10:13:56 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2020-04-20 10:15:40 -0500 |
commit | bedc558809832ce6ef6063fe91656a0fff0e222c (patch) | |
tree | f844a11ae25f1866bffb79d9eaf0d66aa2babcd6 /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | |
parent | b54c8813d632cb44c7deb207e91bd32f01f33794 (diff) | |
parent | 28165dad3ac02a6d3ba4b0cda51992a1831515dd (diff) | |
download | pleroma-bedc558809832ce6ef6063fe91656a0fff0e222c.tar.gz pleroma-bedc558809832ce6ef6063fe91656a0fff0e222c.zip |
Merge remote-tracking branch 'upstream/develop' into accept-deletes
Diffstat (limited to 'test/web/pleroma_api/controllers/pleroma_api_controller_test.exs')
-rw-r--r-- | test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs index 8bf7eb3be..61a1689b9 100644 --- a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs +++ b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs @@ -220,7 +220,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do test "POST /api/v1/pleroma/conversations/read" do user = insert(:user) - %{user: other_user, conn: conn} = oauth_access(["write:notifications"]) + %{user: other_user, conn: conn} = oauth_access(["write:conversations"]) {:ok, _activity} = CommonAPI.post(user, %{"status" => "Hi @#{other_user.nickname}", "visibility" => "direct"}) |