Merge branch 'develop' into dtluna/pleroma-refactor/1

[akkoma] / test / support / builders / activity_builder.ex

diff --git a/test/support/builders/activity_builder.ex b/test/support/builders/activity_builder.ex
index a82dc29d431f827d1073174495071cdde6fbfe55..16011edbfda2d9d386e0034b19679032b917e758 100644 (file)
--- a/test/support/builders/activity_builder.ex
+++ b/test/support/builders/activity_builder.ex
@@ -3,9 +3,9 @@ defmodule Pleroma.Builders.ActivityBuilder do
   alias Pleroma.Web.ActivityPub.ActivityPub
 
   def build(data \\ %{}, opts \\ %{}) do
-    user = opts[:user] || UserBuilder.build
+    user = opts[:user] || Pleroma.Factory.insert(:user)
     activity = %{
-      "id" => 1,
+      "id" => Pleroma.Web.ActivityPub.ActivityPub.generate_object_id,
       "actor" => user.ap_id,
       "to" => ["https://www.w3.org/ns/activitystreams#Public"],
       "object" => %{
@@ -23,13 +23,13 @@ defmodule Pleroma.Builders.ActivityBuilder do
 
   def insert_list(times, data \\ %{}, opts \\ %{}) do
     Enum.map(1..times, fn (n) ->
-      {:ok, activity} = insert(Map.merge(data, %{"id" => n}))
+      {:ok, activity} = insert(data)
       activity
     end)
   end
 
   def public_and_non_public do
-    {:ok, user} = UserBuilder.insert
+    user = Pleroma.Factory.insert(:user)
 
     public = build(%{"id" => 1}, %{user: user})
     non_public = build(%{"id" => 2, "to" => []}, %{user: user})