From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 5 Dec 2019 07:55:48 +0000 (+0700)
Subject: Merge branch 'develop' into improve-move-notificaions-api
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d4953474ac5546d771879c32d3a7ec40675a00a1;p=akkoma

Merge branch 'develop' into improve-move-notificaions-api
---

d4953474ac5546d771879c32d3a7ec40675a00a1
diff --cc test/web/mastodon_api/views/notification_view_test.exs
index cd36cb538,26e1afc85..ba1721e06
--- a/test/web/mastodon_api/views/notification_view_test.exs
+++ b/test/web/mastodon_api/views/notification_view_test.exs
@@@ -117,7 -117,10 +117,10 @@@ defmodule Pleroma.Web.MastodonAPI.Notif
      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)
 +    [notification] = Notification.for_user(follower, %{with_move: true})
  
      expected = %{
        id: to_string(notification.id),