diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-20 20:37:56 +0400 | 
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-20 20:37:56 +0400 | 
| commit | 364eecc49f137ae3c7798ad240983591e27b134c (patch) | |
| tree | 7ed228221db9794b0aae59fa0e548623c0aa12ae /test/web/pleroma_api | |
| parent | dc8fa04192cc133749e762b78ec043e0902d046d (diff) | |
| parent | 28165dad3ac02a6d3ba4b0cda51992a1831515dd (diff) | |
| download | pleroma-364eecc49f137ae3c7798ad240983591e27b134c.tar.gz pleroma-364eecc49f137ae3c7798ad240983591e27b134c.zip | |
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'test/web/pleroma_api')
| -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"}) | 
