X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fnotification_test.exs;h=568ad642cf37ee764864915c0e5fa0bf6dfc579f;hb=4dfb40a5467f6206b2793bdafbd82a7ae4ee04bf;hp=eee1c9fa38c0cb6d26847cb353cfa84759ae239a;hpb=e6a78c6ed0925c27ea4d194c0e52ab07542c444e;p=akkoma diff --git a/test/notification_test.exs b/test/notification_test.exs index eee1c9fa3..568ad642c 100644 --- a/test/notification_test.exs +++ b/test/notification_test.exs @@ -10,13 +10,16 @@ defmodule Pleroma.NotificationTest do other_user = insert(:user) third_user = insert(:user) - {:ok, activity} = TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname} and @#{third_user.nickname}"}) + {:ok, activity} = + TwitterAPI.create_status(user, %{ + "status" => "hey @#{other_user.nickname} and @#{third_user.nickname}" + }) {:ok, [notification, other_notification]} = Notification.create_notifications(activity) - assert notification.user_id == other_user.id + notified_ids = Enum.sort([notification.user_id, other_notification.user_id]) + assert notified_ids == [other_user.id, third_user.id] assert notification.activity_id == activity.id - assert other_notification.user_id == third_user.id assert other_notification.activity_id == activity.id end end @@ -37,7 +40,9 @@ defmodule Pleroma.NotificationTest do user = insert(:user) other_user = insert(:user) - {:ok, activity} = TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"}) + {:ok, activity} = + TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"}) + {:ok, [notification]} = Notification.create_notifications(activity) {:ok, notification} = Notification.get(other_user, notification.id) @@ -48,9 +53,11 @@ defmodule Pleroma.NotificationTest do user = insert(:user) other_user = insert(:user) - {:ok, activity} = TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"}) + {:ok, activity} = + TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"}) + {:ok, [notification]} = Notification.create_notifications(activity) - {:error, notification} = Notification.get(user, notification.id) + {:error, _notification} = Notification.get(user, notification.id) end end @@ -59,7 +66,9 @@ defmodule Pleroma.NotificationTest do user = insert(:user) other_user = insert(:user) - {:ok, activity} = TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"}) + {:ok, activity} = + TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"}) + {:ok, [notification]} = Notification.create_notifications(activity) {:ok, notification} = Notification.dismiss(other_user, notification.id) @@ -70,9 +79,11 @@ defmodule Pleroma.NotificationTest do user = insert(:user) other_user = insert(:user) - {:ok, activity} = TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"}) + {:ok, activity} = + TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"}) + {:ok, [notification]} = Notification.create_notifications(activity) - {:error, notification} = Notification.dismiss(user, notification.id) + {:error, _notification} = Notification.dismiss(user, notification.id) end end @@ -82,9 +93,18 @@ defmodule Pleroma.NotificationTest do other_user = insert(:user) third_user = insert(:user) - {:ok, activity} = TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname} and @#{third_user.nickname} !"}) + {:ok, activity} = + TwitterAPI.create_status(user, %{ + "status" => "hey @#{other_user.nickname} and @#{third_user.nickname} !" + }) + {:ok, _notifs} = Notification.create_notifications(activity) - {:ok, activity} = TwitterAPI.create_status(user, %{"status" => "hey again @#{other_user.nickname} and @#{third_user.nickname} !"}) + + {:ok, activity} = + TwitterAPI.create_status(user, %{ + "status" => "hey again @#{other_user.nickname} and @#{third_user.nickname} !" + }) + {:ok, _notifs} = Notification.create_notifications(activity) Notification.clear(other_user)