diff options
| author | feld <feld@feld.me> | 2020-08-25 21:32:32 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-08-25 21:32:32 +0000 |
| commit | fb33321fa2b3638af1c1edc35de1e4d23ba18711 (patch) | |
| tree | 53fe5e1774537d984c0c7443f5eb0d7ebf04442f /test/web | |
| parent | 976094cd7bdeed740a3dce8b8aac029d06603ed3 (diff) | |
| parent | 25c69e271a3ea6687805e0bd0d4b902cda06e364 (diff) | |
| download | pleroma-fb33321fa2b3638af1c1edc35de1e4d23ba18711.tar.gz pleroma-fb33321fa2b3638af1c1edc35de1e4d23ba18711.zip | |
Merge branch 'feature/1952-read-muted-notifications' into 'develop'
Automatically mark notifications about statuses from muted users and threads as read
Closes #1952
See merge request pleroma/pleroma!2893
Diffstat (limited to 'test/web')
| -rw-r--r-- | test/web/mastodon_api/views/notification_view_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/mastodon_api/views/notification_view_test.exs b/test/web/mastodon_api/views/notification_view_test.exs index 8e0e58538..2f6a808f1 100644 --- a/test/web/mastodon_api/views/notification_view_test.exs +++ b/test/web/mastodon_api/views/notification_view_test.exs @@ -219,7 +219,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do expected = %{ id: to_string(notification.id), - pleroma: %{is_seen: false, is_muted: true}, + pleroma: %{is_seen: true, is_muted: true}, type: "favourite", account: AccountView.render("show.json", %{user: another_user, for: user}), status: StatusView.render("show.json", %{activity: create_activity, for: user}), |