limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

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

Browse source
This commit is contained in:
lain 2019-12-04 14:25:00 +01:00
commit 24599c519f
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/web/mastodon_api/views/notification_view_test.exs
View file

@ -117,6 +117,9 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
Pleroma.Web.ActivityPub.ActivityPub.move(old_user, new_user) Pleroma.Web.ActivityPub.ActivityPub.move(old_user, new_user)
Pleroma.Tests.ObanHelpers.perform_all() 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)
expected = %{ expected = %{