projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into notifications-from-account
[akkoma]
/
test
/
web
/
mastodon_api
/
views
/
notification_view_test.exs
diff --git
a/test/web/mastodon_api/views/notification_view_test.exs
b/test/web/mastodon_api/views/notification_view_test.exs
index 26e1afc857d5fc8f2ae5f68f65ba3f9cdc4f5920..ba1721e06dd5b9ebf5ec884e5df9d0e9ffffc53e 100644
(file)
--- a/
test/web/mastodon_api/views/notification_view_test.exs
+++ b/
test/web/mastodon_api/views/notification_view_test.exs
@@
-109,8
+109,8
@@
defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
end
test "Move notification" do
end
test "Move notification" do
-
%{ap_id: old_ap_id} =
old_user = insert(:user)
-
%{ap_id: _new_ap_id} = new_user = insert(:user, also_known_as: [old_
ap_id])
+ old_user = insert(:user)
+
new_user = insert(:user, also_known_as: [old_user.
ap_id])
follower = insert(:user)
User.follow(follower, old_user)
follower = insert(:user)
User.follow(follower, old_user)
@@
-120,7
+120,7
@@
defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
old_user = refresh_record(old_user)
new_user = refresh_record(new_user)
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),
expected = %{
id: to_string(notification.id),