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/mastodon_api | |
| parent | 0cf43391f272b2bb756b564e12bbcd3efda6a4bd (diff) | |
| parent | 7e9aaa0d0221311d831161d977c8b0e2a55b3439 (diff) | |
| download | pleroma-fbcc53760e6fcd393513c05a5bd7a4a6a6f3b731.tar.gz | |
Merge branch 'feature/emojireactvalidator' into 'develop'
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
Diffstat (limited to 'test/web/mastodon_api')
| -rw-r--r-- | test/web/mastodon_api/views/notification_view_test.exs | 2 | ||||
| -rw-r--r-- | test/web/mastodon_api/views/status_view_test.exs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/web/mastodon_api/views/notification_view_test.exs b/test/web/mastodon_api/views/notification_view_test.exs index c3ec9dfec..0806269a2 100644 --- a/test/web/mastodon_api/views/notification_view_test.exs +++ b/test/web/mastodon_api/views/notification_view_test.exs @@ -156,7 +156,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do other_user = insert(:user) {:ok, activity} = CommonAPI.post(user, %{"status" => "#cofe"}) - {:ok, _activity, _} = CommonAPI.react_with_emoji(activity.id, other_user, "☕") + {:ok, _activity} = CommonAPI.react_with_emoji(activity.id, other_user, "☕") activity = Repo.get(Activity, activity.id) diff --git a/test/web/mastodon_api/views/status_view_test.exs b/test/web/mastodon_api/views/status_view_test.exs index 451723e60..b5e7dc317 100644 --- a/test/web/mastodon_api/views/status_view_test.exs +++ b/test/web/mastodon_api/views/status_view_test.exs @@ -32,9 +32,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do third_user = insert(:user) {:ok, activity} = CommonAPI.post(user, %{"status" => "dae cofe??"}) - {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, user, "☕") - {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, third_user, "🍵") - {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, other_user, "☕") + {:ok, _} = CommonAPI.react_with_emoji(activity.id, user, "☕") + {:ok, _} = CommonAPI.react_with_emoji(activity.id, third_user, "🍵") + {:ok, _} = CommonAPI.react_with_emoji(activity.id, other_user, "☕") activity = Repo.get(Activity, activity.id) status = StatusView.render("show.json", activity: activity) |