diff options
| author | lain <lain@soykaf.club> | 2020-05-08 10:41:41 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-08 10:41:41 +0000 |
| commit | fbcc53760e6fcd393513c05a5bd7a4a6a6f3b731 (patch) | |
| tree | 86b0bb94dcb176c1708d174a339223fb0fe34ec5 /test/web/pleroma_api/controllers | |
| parent | 0cf43391f272b2bb756b564e12bbcd3efda6a4bd (diff) | |
| parent | 7e9aaa0d0221311d831161d977c8b0e2a55b3439 (diff) | |
| download | pleroma-fbcc53760e6fcd393513c05a5bd7a4a6a6f3b731.tar.gz pleroma-fbcc53760e6fcd393513c05a5bd7a4a6a6f3b731.zip | |
Merge branch 'feature/emojireactvalidator' into 'develop'
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
Diffstat (limited to 'test/web/pleroma_api/controllers')
| -rw-r--r-- | test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | 10 |
1 files changed, 5 insertions, 5 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 299dbad41..43f1b154d 100644 --- a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs +++ b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs @@ -43,7 +43,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do other_user = insert(:user) {:ok, activity} = CommonAPI.post(user, %{"status" => "#cofe"}) - {:ok, _reaction, _object} = CommonAPI.react_with_emoji(activity.id, other_user, "☕") + {:ok, _reaction_activity} = CommonAPI.react_with_emoji(activity.id, other_user, "☕") ObanHelpers.perform_all() @@ -77,8 +77,8 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do assert result == [] - {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, other_user, "🎅") - {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, doomed_user, "🎅") + {:ok, _} = CommonAPI.react_with_emoji(activity.id, other_user, "🎅") + {:ok, _} = CommonAPI.react_with_emoji(activity.id, doomed_user, "🎅") User.perform(:delete, doomed_user) @@ -115,8 +115,8 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do assert result == [] - {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, other_user, "🎅") - {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, other_user, "☕") + {:ok, _} = CommonAPI.react_with_emoji(activity.id, other_user, "🎅") + {:ok, _} = CommonAPI.react_with_emoji(activity.id, other_user, "☕") result = conn |