diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-12-06 00:12:21 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-12-06 00:12:21 +0300 |
| commit | cdff5b82670313e46c2b362d4cf041779af6a6bd (patch) | |
| tree | edc39a1b48f48334480e709fbda844cb120b32f8 /test/web/mastodon_api/controllers/notification_controller_test.exs | |
| parent | 9f99640cfc81f28c0b6cdb5f6ef065b3e46f5f23 (diff) | |
| parent | 67d8df04a440ec9b2949bdddd3a3d8dd70c9b140 (diff) | |
| download | pleroma-cdff5b82670313e46c2b362d4cf041779af6a6bd.tar.gz pleroma-cdff5b82670313e46c2b362d4cf041779af6a6bd.zip | |
Merge branch 'develop' into fix/mrf-delete
Diffstat (limited to 'test/web/mastodon_api/controllers/notification_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/notification_controller_test.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/mastodon_api/controllers/notification_controller_test.exs b/test/web/mastodon_api/controllers/notification_controller_test.exs index fa55a7cf9..00a85169e 100644 --- a/test/web/mastodon_api/controllers/notification_controller_test.exs +++ b/test/web/mastodon_api/controllers/notification_controller_test.exs @@ -289,7 +289,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do assert length(json_response(conn, 200)) == 1 - {:ok, user} = User.mute(user, user2) + {:ok, _user_relationships} = User.mute(user, user2) conn = assign(build_conn(), :user, user) conn = get(conn, "/api/v1/notifications") @@ -310,7 +310,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do assert length(json_response(conn, 200)) == 1 - {:ok, user} = User.mute(user, user2, false) + {:ok, _user_relationships} = User.mute(user, user2, false) conn = assign(build_conn(), :user, user) conn = get(conn, "/api/v1/notifications") @@ -333,7 +333,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do assert length(json_response(conn, 200)) == 1 - {:ok, user} = User.mute(user, user2) + {:ok, _user_relationships} = User.mute(user, user2) conn = assign(build_conn(), :user, user) conn = get(conn, "/api/v1/notifications", %{"with_muted" => "true"}) |