From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Sat, 17 Oct 2020 14:53:47 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=9ea31b373fdb75bb6aa04d006e5f493158897efa;p=akkoma

Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
---

9ea31b373fdb75bb6aa04d006e5f493158897efa
diff --cc test/pleroma/notification_test.exs
index ac43096fb,0e9630f28..a74fb7bc2
--- a/test/pleroma/notification_test.exs
+++ b/test/pleroma/notification_test.exs
@@@ -397,10 -397,10 +397,10 @@@ defmodule Pleroma.NotificationTest d
      end
  
      test "dismisses the notification on follow request rejection" do
-       user = insert(:user, locked: true)
+       user = insert(:user, is_locked: true)
        follower = insert(:user)
        {:ok, _, _, _follow_activity} = CommonAPI.follow(follower, user)
 -      assert [notification] = Notification.for_user(user)
 +      assert [_notification] = Notification.for_user(user)
        {:ok, _follower} = CommonAPI.reject_follow_request(follower, user)
        assert [] = Notification.for_user(user)
      end