diff options
| author | feld <feld@feld.me> | 2019-05-16 19:09:19 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2019-05-16 19:09:19 +0000 |
| commit | 0f8892686a659283d0242998b08e9c6d95ccb2c3 (patch) | |
| tree | 2f6f13d59fb1e42a8e932cb28d54416b297ad588 /test/support | |
| parent | e190b3022b29753fd7682947a293775c8801d4b7 (diff) | |
| parent | e2b3a27204ca511a2e455a1151fdea36fdc0e53d (diff) | |
| download | pleroma-0f8892686a659283d0242998b08e9c6d95ccb2c3.tar.gz pleroma-0f8892686a659283d0242998b08e9c6d95ccb2c3.zip | |
Merge branch 'feature/admin-api-reports' into 'develop'
Add Reports to Admin API
Closes #774
See merge request pleroma/pleroma!1107
Diffstat (limited to 'test/support')
| -rw-r--r-- | test/support/factory.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/support/factory.ex b/test/support/factory.ex index 2a2954ad6..90c7d80f2 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -43,7 +43,7 @@ defmodule Pleroma.Factory do def note_factory(attrs \\ %{}) do text = sequence(:text, &"This is :moominmamma: note #{&1}") - user = insert(:user) + user = attrs[:user] || insert(:user) data = %{ "type" => "Note", @@ -113,7 +113,8 @@ defmodule Pleroma.Factory do end def note_activity_factory(attrs \\ %{}) do - note = attrs[:note] || insert(:note) + user = attrs[:user] || insert(:user) + note = attrs[:note] || insert(:note, user: user) data = %{ "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(), |