diff options
author | dtluna <dtluna@openmailbox.org> | 2017-04-16 17:12:28 +0300 |
---|---|---|
committer | dtluna <dtluna@openmailbox.org> | 2017-04-16 17:12:28 +0300 |
commit | 82914e1e4de37747653c83644b428c1ba29428c9 (patch) | |
tree | 0688c91826f16ba428a9cea7a25a74ed2ae19e1d /test/support/builders/activity_builder.ex | |
parent | 594dd01ab2864482d8c1cdb0153d7b4b0972b3b4 (diff) | |
parent | e158e32124a62f2c93a8910bf3edc4519c4a13e6 (diff) | |
download | pleroma-82914e1e4de37747653c83644b428c1ba29428c9.tar.gz pleroma-82914e1e4de37747653c83644b428c1ba29428c9.zip |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
Diffstat (limited to 'test/support/builders/activity_builder.ex')
-rw-r--r-- | test/support/builders/activity_builder.ex | 4 |
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}) |