projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remote Timeline: add Streaming support
[akkoma]
/
test
/
notification_test.exs
diff --git
a/test/notification_test.exs
b/test/notification_test.exs
index 8243cfd347309ec54b5ff69faf1a4af7a6e7649e..f2e0f0b0d8ccfa26ae7b6cc5c3f4cc33893e07c1 100644
(file)
--- a/
test/notification_test.exs
+++ b/
test/notification_test.exs
@@
-179,17
+179,19
@@
defmodule Pleroma.NotificationTest do
describe "create_notification" do
@tag needs_streamer: true
test "it creates a notification for user and send to the 'user' and the 'user:notification' stream" do
describe "create_notification" do
@tag needs_streamer: true
test "it creates a notification for user and send to the 'user' and the 'user:notification' stream" do
-
user = insert(:user
)
+
%{user: user, token: oauth_token} = oauth_access(["read"]
)
task =
Task.async(fn ->
task =
Task.async(fn ->
-
Streamer.get_topic_and_add_socket("user", user
)
+
{:ok, _topic} = Streamer.get_topic_and_add_socket("user", user, oauth_token
)
assert_receive {:render_with_user, _, _, _}, 4_000
end)
task_user_notification =
Task.async(fn ->
assert_receive {:render_with_user, _, _, _}, 4_000
end)
task_user_notification =
Task.async(fn ->
- Streamer.get_topic_and_add_socket("user:notification", user)
+ {:ok, _topic} =
+ Streamer.get_topic_and_add_socket("user:notification", user, oauth_token)
+
assert_receive {:render_with_user, _, _, _}, 4_000
end)
assert_receive {:render_with_user, _, _, _}, 4_000
end)
@@
-217,7
+219,10
@@
defmodule Pleroma.NotificationTest do
muter = Repo.get(User, muter.id)
{:ok, activity} = CommonAPI.post(muted, %{status: "Hi @#{muter.nickname}"})
muter = Repo.get(User, muter.id)
{:ok, activity} = CommonAPI.post(muted, %{status: "Hi @#{muter.nickname}"})
- assert Notification.create_notification(activity, muter)
+ notification = Notification.create_notification(activity, muter)
+
+ assert notification.id
+ assert notification.seen
end
test "notification created if user is muted without notifications" do
end
test "notification created if user is muted without notifications" do
@@
-243,7
+248,10
@@
defmodule Pleroma.NotificationTest do
in_reply_to_status_id: activity.id
})
in_reply_to_status_id: activity.id
})
- assert Notification.create_notification(activity, muter)
+ notification = Notification.create_notification(activity, muter)
+
+ assert notification.id
+ assert notification.seen
end
test "it disables notifications from strangers" do
end
test "it disables notifications from strangers" do
@@
-317,6
+325,7
@@
defmodule Pleroma.NotificationTest do
{:ok, [notification]} = Notification.create_notifications(status)
assert notification
{:ok, [notification]} = Notification.create_notifications(status)
assert notification
+ refute notification.seen
end
test "it creates notifications when someone likes user's status with a filtered word" do
end
test "it creates notifications when someone likes user's status with a filtered word" do
@@
-330,6
+339,7
@@
defmodule Pleroma.NotificationTest do
{:ok, [notification]} = Notification.create_notifications(activity_two)
assert notification
{:ok, [notification]} = Notification.create_notifications(activity_two)
assert notification
+ refute notification.seen
end
end
end
end
@@
-1012,6
+1022,7
@@
defmodule Pleroma.NotificationTest do
[notification] = Notification.for_user(user)
assert notification.activity.object
[notification] = Notification.for_user(user)
assert notification.activity.object
+ assert notification.seen
end
test "it doesn't return notifications for muted user with notifications", %{user: user} do
end
test "it doesn't return notifications for muted user with notifications", %{user: user} do