diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-05-09 11:31:34 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-05-09 11:31:34 +0300 |
| commit | 942093683a1e6b3f3d3692268b2af8390da6d325 (patch) | |
| tree | 3ad22c9d4d06716f469925b7c15a30e9f0e25c57 /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | |
| parent | cbe383ae832f13d5d2a20ee8fb5e85498205fbc3 (diff) | |
| parent | c962c6afb3b30eb6d42c2a5548898b3713492169 (diff) | |
| download | pleroma-942093683a1e6b3f3d3692268b2af8390da6d325.tar.gz pleroma-942093683a1e6b3f3d3692268b2af8390da6d325.zip | |
Merge branch 'develop' into feature/admin-api-status-count-per-instance
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 | 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 |