diff options
| author | dtluna <dtluna@openmailbox.org> | 2017-04-16 17:08:17 +0300 |
|---|---|---|
| committer | dtluna <dtluna@openmailbox.org> | 2017-04-16 17:08:17 +0300 |
| commit | 5229b0194477bea6e513d9e8286956a553133545 (patch) | |
| tree | fb1655e5dd1f06e52da676c7c4026a5997cfd206 /test/support | |
| parent | 63f04b314d67decefab3a53b43d04b0347adde13 (diff) | |
| parent | e158e32124a62f2c93a8910bf3edc4519c4a13e6 (diff) | |
| download | pleroma-5229b0194477bea6e513d9e8286956a553133545.tar.gz pleroma-5229b0194477bea6e513d9e8286956a553133545.zip | |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
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}) |