diff options
| author | dtluna <dtluna@openmailbox.org> | 2017-04-16 17:13:42 +0300 |
|---|---|---|
| committer | dtluna <dtluna@openmailbox.org> | 2017-04-16 17:13:42 +0300 |
| commit | f6547f7b7fa72a9730773012394c522ac6b17398 (patch) | |
| tree | be5af86ddc8c353cdc90e1bfac67bbc1f66f9b1c /test/support | |
| parent | 9a8c348aed7772c9e2173163687e63943cf491fb (diff) | |
| parent | e158e32124a62f2c93a8910bf3edc4519c4a13e6 (diff) | |
| download | pleroma-f6547f7b7fa72a9730773012394c522ac6b17398.tar.gz pleroma-f6547f7b7fa72a9730773012394c522ac6b17398.zip | |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name
Diffstat (limited to 'test/support')
| -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}) |