summaryrefslogtreecommitdiff
path: root/test/support/builders
diff options
context:
space:
mode:
authordtluna <dtluna@openmailbox.org>2017-04-16 17:18:34 +0300
committerdtluna <dtluna@openmailbox.org>2017-04-16 17:18:34 +0300
commitef5033d7a7f744607235e974c7beb96b014c2b61 (patch)
treeb885af1dedf3978ad265cf769713915d04510d0f /test/support/builders
parenta8e50d602ba25b2062e0e676e1dd115da64c2565 (diff)
parente158e32124a62f2c93a8910bf3edc4519c4a13e6 (diff)
downloadpleroma-ef5033d7a7f744607235e974c7beb96b014c2b61.tar.gz
pleroma-ef5033d7a7f744607235e974c7beb96b014c2b61.zip
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
Diffstat (limited to 'test/support/builders')
-rw-r--r--test/support/builders/activity_builder.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/support/builders/activity_builder.ex b/test/support/builders/activity_builder.ex
index a82dc29d4..0f9cd0d15 100644
--- a/test/support/builders/activity_builder.ex
+++ b/test/support/builders/activity_builder.ex
@@ -3,7 +3,7 @@ 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,
"actor" => user.ap_id,
@@ -29,7 +29,7 @@ defmodule Pleroma.Builders.ActivityBuilder do
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})