Hook unfollow into TwitterAPI

[akkoma] / test / support / factory.ex

diff --git a/test/support/factory.ex b/test/support/factory.ex
index dabb951415ff1bc882ad3c350c16f707e370ad29..8e21e2562da62cc47ee5b34ccece059cbbed7ea0 100644 (file)
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -9,20 +9,27 @@ defmodule Pleroma.Factory do
       password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
       bio: sequence(:bio, &"Tester Number #{&1}")
     }
-    %{ user | ap_id: Pleroma.User.ap_id(user), follower_address: Pleroma.User.ap_followers(user) }
+
+    %{
+      user
+      | ap_id: Pleroma.User.ap_id(user),
+        follower_address: Pleroma.User.ap_followers(user),
+        following: [Pleroma.User.ap_id(user)]
+    }
   end
 
   def note_factory do
     text = sequence(:text, &"This is :moominmamma: note #{&1}")
 
     user = insert(:user)
+
     data = %{
       "type" => "Note",
       "content" => text,
-      "id" => Pleroma.Web.ActivityPub.Utils.generate_object_id,
+      "id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(),
       "actor" => user.ap_id,
       "to" => ["https://www.w3.org/ns/activitystreams#Public"],
-      "published" => DateTime.utc_now() |> DateTime.to_iso8601,
+      "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
       "likes" => [],
       "like_count" => 0,
       "context" => "2hu",
@@ -40,18 +47,21 @@ defmodule Pleroma.Factory do
 
   def note_activity_factory do
     note = insert(:note)
+
     data = %{
-      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id,
+      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
       "type" => "Create",
       "actor" => note.data["actor"],
       "to" => note.data["to"],
       "object" => note.data,
-      "published" => DateTime.utc_now() |> DateTime.to_iso8601,
+      "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
       "context" => note.data["context"]
     }
 
     %Pleroma.Activity{
-      data: data
+      data: data,
+      actor: data["actor"],
+      recipients: data["to"]
     }
   end
 
@@ -60,11 +70,11 @@ defmodule Pleroma.Factory do
     user = insert(:user)
 
     data = %{
-      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id,
+      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
       "actor" => user.ap_id,
       "type" => "Like",
       "object" => note_activity.data["object"]["id"],
-      "published_at" => DateTime.utc_now() |> DateTime.to_iso8601
+      "published_at" => DateTime.utc_now() |> DateTime.to_iso8601()
     }
 
     %Pleroma.Activity{
@@ -77,11 +87,11 @@ defmodule Pleroma.Factory do
     followed = insert(:user)
 
     data = %{
-      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id,
+      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
       "actor" => follower.ap_id,
       "type" => "Follow",
       "object" => followed.ap_id,
-      "published_at" => DateTime.utc_now() |> DateTime.to_iso8601
+      "published_at" => DateTime.utc_now() |> DateTime.to_iso8601()
     }
 
     %Pleroma.Activity{
@@ -94,7 +104,7 @@ defmodule Pleroma.Factory do
       topic: "http://example.org",
       callback: "http://example/org/callback",
       secret: "here's a secret",
-      valid_until: NaiveDateTime.add(NaiveDateTime.utc_now, 100),
+      valid_until: NaiveDateTime.add(NaiveDateTime.utc_now(), 100),
       state: "requested"
     }
   end