Merge branch 'tests/media_proxy' into 'develop'

[akkoma] / test / support / factory.ex

diff --git a/test/support/factory.ex b/test/support/factory.ex
index b1023da38d2072ea77b13caa8722efb745246c02..531eb81e4cc553173cbbd877d48e63a8939a088f 100644 (file)
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -4,8 +4,8 @@
 
 defmodule Pleroma.Factory do
   use ExMachina.Ecto, repo: Pleroma.Repo
-  alias Pleroma.User
   alias Pleroma.Object
+  alias Pleroma.User
 
   def participation_factory do
     conversation = insert(:conversation)
@@ -38,6 +38,7 @@ defmodule Pleroma.Factory do
       user
       | ap_id: User.ap_id(user),
         follower_address: User.ap_followers(user),
+        following_address: User.ap_following(user),
         following: [User.ap_id(user)]
     }
   end
@@ -117,6 +118,7 @@ defmodule Pleroma.Factory do
   def note_activity_factory(attrs \\ %{}) do
     user = attrs[:user] || insert(:user)
     note = attrs[:note] || insert(:note, user: user)
+    attrs = Map.drop(attrs, [:user, :note])
 
     data = %{
       "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
@@ -133,6 +135,7 @@ defmodule Pleroma.Factory do
       actor: data["actor"],
       recipients: data["to"]
     }
+    |> Map.merge(attrs)
   end
 
   def article_activity_factory do