Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit

2019-12-04 14:25:00 +01:00 · 2019-12-04 14:25:00 +01:00 · 24599c519f
parent 9487995e8b 228bf4d214
commit 24599c519f
1 changed files with 3 additions and 0 deletions
--- a/test/web/mastodon_api/views/notification_view_test.exs
+++ b/test/web/mastodon_api/views/notification_view_test.exs
@ -117,6 +117,9 @@ test "Move notification" 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)

    expected = %{