projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/develop' into reactions
[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 86268fcfa650bd3c3a1e6dbfece4186ba033f628..c9043a69ada032c61f404dcf7c96800c9c8ecdd5 100644
(file)
--- a/
test/web/mastodon_api/views/notification_view_test.exs
+++ b/
test/web/mastodon_api/views/notification_view_test.exs
@@
-27,7
+27,7
@@
defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
id: to_string(notification.id),
pleroma: %{is_seen: false},
type: "mention",
id: to_string(notification.id),
pleroma: %{is_seen: false},
type: "mention",
- account: AccountView.render("
account
.json", %{user: user, for: mentioned_user}),
+ account: AccountView.render("
show
.json", %{user: user, for: mentioned_user}),
status: StatusView.render("show.json", %{activity: activity, for: mentioned_user}),
created_at: Utils.to_masto_date(notification.inserted_at)
}
status: StatusView.render("show.json", %{activity: activity, for: mentioned_user}),
created_at: Utils.to_masto_date(notification.inserted_at)
}
@@
-50,7
+50,7
@@
defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
id: to_string(notification.id),
pleroma: %{is_seen: false},
type: "favourite",
id: to_string(notification.id),
pleroma: %{is_seen: false},
type: "favourite",
- account: AccountView.render("
account
.json", %{user: another_user, for: user}),
+ account: AccountView.render("
show
.json", %{user: another_user, for: user}),
status: StatusView.render("show.json", %{activity: create_activity, for: user}),
created_at: Utils.to_masto_date(notification.inserted_at)
}
status: StatusView.render("show.json", %{activity: create_activity, for: user}),
created_at: Utils.to_masto_date(notification.inserted_at)
}
@@
-72,7
+72,7
@@
defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
id: to_string(notification.id),
pleroma: %{is_seen: false},
type: "reblog",
id: to_string(notification.id),
pleroma: %{is_seen: false},
type: "reblog",
- account: AccountView.render("
account
.json", %{user: another_user, for: user}),
+ account: AccountView.render("
show
.json", %{user: another_user, for: user}),
status: StatusView.render("show.json", %{activity: reblog_activity, for: user}),
created_at: Utils.to_masto_date(notification.inserted_at)
}
status: StatusView.render("show.json", %{activity: reblog_activity, for: user}),
created_at: Utils.to_masto_date(notification.inserted_at)
}
@@
-92,7
+92,7
@@
defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
id: to_string(notification.id),
pleroma: %{is_seen: false},
type: "follow",
id: to_string(notification.id),
pleroma: %{is_seen: false},
type: "follow",
- account: AccountView.render("
account
.json", %{user: follower, for: followed}),
+ account: AccountView.render("
show
.json", %{user: follower, for: followed}),
created_at: Utils.to_masto_date(notification.inserted_at)
}
created_at: Utils.to_masto_date(notification.inserted_at)
}
@@
-100,5
+100,11
@@
defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
NotificationView.render("index.json", %{notifications: [notification], for: followed})
assert [expected] == result
NotificationView.render("index.json", %{notifications: [notification], for: followed})
assert [expected] == result
+
+ User.perform(:delete, follower)
+ notification = Notification |> Repo.one() |> Repo.preload(:activity)
+
+ assert [] ==
+ NotificationView.render("index.json", %{notifications: [notification], for: followed})
end
end
end
end