X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fnotification_test.exs;h=2ca1ac13daf679c136c587ba981dd1f74821c57b;hb=06c97f211fc4a8c9c9c7e77143c3398ade817ab4;hp=eee1c9fa38c0cb6d26847cb353cfa84759ae239a;hpb=08bc31674218cd7ce634b008b7766b48e49c52e3;p=akkoma

diff --git a/test/notification_test.exs b/test/notification_test.exs
index eee1c9fa3..2ca1ac13d 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
@@ -30,6 +33,13 @@ defmodule Pleroma.NotificationTest do
 
       assert nil == Notification.create_notification(activity, user)
     end
+
+    test "it doesn't create a notification for user if he is the activity author" do
+      activity = insert(:note_activity)
+      author = User.get_by_ap_id(activity.data["actor"])
+
+      assert nil == Notification.create_notification(activity, author)
+    end
   end
 
   describe "get notification" do
@@ -37,7 +47,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 +60,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 +73,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 +86,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 +100,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)