From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Wed, 18 Mar 2020 11:08:21 +0000 (+0300)
Subject: Merge branch 'develop' into gun
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f9ecb513faec53758371f6d6efd78668997a1d15;p=akkoma

Merge branch 'develop' into gun
---

f9ecb513faec53758371f6d6efd78668997a1d15
diff --cc test/web/mastodon_api/controllers/notification_controller_test.exs
index 0f0a060d2,dbe9a7fd7..4f6a88950
--- a/test/web/mastodon_api/controllers/notification_controller_test.exs
+++ b/test/web/mastodon_api/controllers/notification_controller_test.exs
@@@ -407,8 -407,7 +407,8 @@@ defmodule Pleroma.Web.MastodonAPI.Notif
      assert length(json_response(conn, 200)) == 1
    end
  
 +  @tag capture_log: true
-   test "see move notifications with `with_move` parameter" do
+   test "see move notifications" do
      old_user = insert(:user)
      new_user = insert(:user, also_known_as: [old_user.ap_id])
      %{user: follower, conn: conn} = oauth_access(["read:notifications"])