X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fconversation_test.exs;h=f3300e7d18a535db0deb78df160197369821ab0d;hb=81d1aa424d65b364ec8f2aee45247e7d95e3f255;hp=150d55631d884a29a0eedb62cb3d83493b1d1c41;hpb=c1ebb38d3adc1d222be832405ec0d7497b61f94a;p=akkoma

diff --git a/test/conversation_test.exs b/test/conversation_test.exs
index 150d55631..f3300e7d1 100644
--- a/test/conversation_test.exs
+++ b/test/conversation_test.exs
@@ -22,7 +22,8 @@ defmodule Pleroma.ConversationTest do
     user = insert(:user)
     {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey"})
 
-    context = activity.data["object"]["context"]
+    object = Pleroma.Object.normalize(activity)
+    context = object.data["context"]
 
     conversation = Conversation.get_for_ap_id(context)
 
@@ -37,7 +38,8 @@ defmodule Pleroma.ConversationTest do
     {:ok, activity} =
       CommonAPI.post(har, %{"status" => "Hey @#{jafnhar.nickname}", "visibility" => "direct"})
 
-    context = activity.data["object"]["context"]
+    object = Pleroma.Object.normalize(activity)
+    context = object.data["context"]
 
     conversation =
       Conversation.get_for_ap_id(context)
@@ -58,7 +60,8 @@ defmodule Pleroma.ConversationTest do
         "in_reply_to_status_id" => activity.id
       })
 
-    context = activity.data["object"]["context"]
+    object = Pleroma.Object.normalize(activity)
+    context = object.data["context"]
 
     conversation_two =
       Conversation.get_for_ap_id(context)
@@ -81,11 +84,12 @@ defmodule Pleroma.ConversationTest do
         "in_reply_to_status_id" => activity.id
       })
 
-    context = activity.data["object"]["context"]
+    object = Pleroma.Object.normalize(activity)
+    context = object.data["context"]
 
     conversation_three =
       Conversation.get_for_ap_id(context)
-      |> Repo.preload(:participations)
+      |> Repo.preload([:participations, :users])
 
     assert conversation_three.id == conversation.id
 
@@ -100,5 +104,34 @@ defmodule Pleroma.ConversationTest do
     assert Enum.find(conversation_three.participations, fn %{user_id: user_id} ->
              tridi.id == user_id
            end)
+
+    assert Enum.find(conversation_three.users, fn %{id: user_id} ->
+             har.id == user_id
+           end)
+
+    assert Enum.find(conversation_three.users, fn %{id: user_id} ->
+             jafnhar.id == user_id
+           end)
+
+    assert Enum.find(conversation_three.users, fn %{id: user_id} ->
+             tridi.id == user_id
+           end)
+  end
+
+  test "create_or_bump_for returns the conversation with participations" do
+    har = insert(:user)
+    jafnhar = insert(:user, local: false)
+
+    {:ok, activity} =
+      CommonAPI.post(har, %{"status" => "Hey @#{jafnhar.nickname}", "visibility" => "direct"})
+
+    {:ok, conversation} = Conversation.create_or_bump_for(activity)
+
+    assert length(conversation.participations) == 2
+
+    {:ok, activity} =
+      CommonAPI.post(har, %{"status" => "Hey @#{jafnhar.nickname}", "visibility" => "public"})
+
+    assert {:error, _} = Conversation.create_or_bump_for(activity)
   end
 end