Merge branch 'develop' into issue/1383
This commit is contained in:
commit
680e071dba
@ -117,6 +117,9 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
|
|||||||
Pleroma.Web.ActivityPub.ActivityPub.move(old_user, new_user)
|
Pleroma.Web.ActivityPub.ActivityPub.move(old_user, new_user)
|
||||||
Pleroma.Tests.ObanHelpers.perform_all()
|
Pleroma.Tests.ObanHelpers.perform_all()
|
||||||
|
|
||||||
|
old_user = refresh_record(old_user)
|
||||||
|
new_user = refresh_record(new_user)
|
||||||
|
|
||||||
[notification] = Notification.for_user(follower)
|
[notification] = Notification.for_user(follower)
|
||||||
|
|
||||||
expected = %{
|
expected = %{
|
||||||
|
Loading…
Reference in New Issue
Block a user