diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-29 00:52:50 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-29 00:52:50 +0300 |
| commit | 657277ffc0d3d25be4376ed629057a2d2cefb2e1 (patch) | |
| tree | 3fdd4ca236669df9b2afc5bfcd0e5d6002e23666 /test/web/common_api/common_api_test.exs | |
| parent | c0fa0001476a8a45878a0c75125627164497eddf (diff) | |
| parent | c6668c2e7b9908e479527914ca7eb2c838aaab06 (diff) | |
| download | pleroma-657277ffc0d3d25be4376ed629057a2d2cefb2e1.tar.gz pleroma-657277ffc0d3d25be4376ed629057a2d2cefb2e1.zip | |
Resolve conflicts
Diffstat (limited to 'test/web/common_api/common_api_test.exs')
| -rw-r--r-- | test/web/common_api/common_api_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs index 7ff23b63d..e96106f11 100644 --- a/test/web/common_api/common_api_test.exs +++ b/test/web/common_api/common_api_test.exs @@ -121,7 +121,7 @@ defmodule Pleroma.Web.CommonAPITest do }) Enum.each(["public", "private", "unlisted"], fn visibility -> - assert {:error, {:private_to_public, _}} = + assert {:error, "The message visibility must be direct"} = CommonAPI.post(user, %{ "status" => "suya..", "visibility" => visibility, |