From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Mon, 30 Mar 2020 09:15:23 +0000 (+0300)
Subject: Merge branch 'develop' into gun
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=f497cf2f7c21196c4d633ddf0d14f0a4ede00cea;p=akkoma

Merge branch 'develop' into gun
---

f497cf2f7c21196c4d633ddf0d14f0a4ede00cea
diff --cc test/web/mastodon_api/views/notification_view_test.exs
index ac3e12617,7965af00a..81eefd735
--- a/test/web/mastodon_api/views/notification_view_test.exs
+++ b/test/web/mastodon_api/views/notification_view_test.exs
@@@ -104,11 -109,9 +109,10 @@@ defmodule Pleroma.Web.MastodonAPI.Notif
      User.perform(:delete, follower)
      notification = Notification |> Repo.one() |> Repo.preload(:activity)
  
-     assert [] ==
-              NotificationView.render("index.json", %{notifications: [notification], for: followed})
+     test_notifications_rendering([notification], followed, [])
    end
  
 +  @tag capture_log: true
    test "Move notification" do
      old_user = insert(:user)
      new_user = insert(:user, also_known_as: [old_user.ap_id])