diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-21 08:20:50 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-21 08:20:50 +0300 |
| commit | bb5d0eafa437c9d32cdd8ccdb92b2eabb8ccccf1 (patch) | |
| tree | 307120b8958a5be8dad4a16e6e2ff779336a30e3 /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | |
| parent | f7e623c11c4b6f4f323a4317e9489092be73f9cd (diff) | |
| parent | e57c1b60e4a0f882d5217bf1be8b1a7240aa322d (diff) | |
| download | pleroma-bb5d0eafa437c9d32cdd8ccdb92b2eabb8ccccf1.tar.gz pleroma-bb5d0eafa437c9d32cdd8ccdb92b2eabb8ccccf1.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# CHANGELOG.md
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"}) |