diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-12-05 14:55:48 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-12-05 14:55:48 +0700 |
| commit | d4953474ac5546d771879c32d3a7ec40675a00a1 (patch) | |
| tree | 17757ad482e62087bdcb54076c98448590b98fae | |
| parent | 05fb8d0084553a3ed7d1f10212f49771ce05570f (diff) | |
| parent | 228bf4d214abe3bb62c52128d3bc145e396b174d (diff) | |
| download | pleroma-d4953474ac5546d771879c32d3a7ec40675a00a1.tar.gz pleroma-d4953474ac5546d771879c32d3a7ec40675a00a1.zip | |
Merge branch 'develop' into improve-move-notificaions-api
| -rw-r--r-- | test/web/mastodon_api/views/notification_view_test.exs | 5 |
1 files changed, 4 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 cd36cb538..ba1721e06 100644 --- a/test/web/mastodon_api/views/notification_view_test.exs +++ b/test/web/mastodon_api/views/notification_view_test.exs @@ -117,6 +117,9 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do Pleroma.Web.ActivityPub.ActivityPub.move(old_user, new_user) Pleroma.Tests.ObanHelpers.perform_all() + old_user = refresh_record(old_user) + new_user = refresh_record(new_user) + [notification] = Notification.for_user(follower, %{with_move: true}) expected = %{ @@ -124,7 +127,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do pleroma: %{is_seen: false}, type: "move", account: AccountView.render("show.json", %{user: old_user, for: follower}), - target: AccountView.render("show.json", %{user: refresh_record(new_user), for: follower}), + target: AccountView.render("show.json", %{user: new_user, for: follower}), created_at: Utils.to_masto_date(notification.inserted_at) } |