diff options
| author | lain <lain@soykaf.club> | 2019-08-27 16:38:51 -0500 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-08-27 16:38:51 -0500 |
| commit | f017260cdc90d37c1878d7f2f29263dca017ebeb (patch) | |
| tree | 83b7f405ddaf03e5670635b71ab3d0fca58215da /test/support | |
| parent | a0b21c89284304bea90f2774f17d5b2b7b3c1359 (diff) | |
| parent | 66519f2100c9933b74dc6df52937a18c42961639 (diff) | |
| download | pleroma-f017260cdc90d37c1878d7f2f29263dca017ebeb.tar.gz | |
Merge remote-tracking branch 'origin/develop' into reactions
Diffstat (limited to 'test/support')
| -rw-r--r-- | test/support/factory.ex | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/test/support/factory.ex b/test/support/factory.ex index 62d1de717..719115003 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -207,13 +207,15 @@ defmodule Pleroma.Factory do object = Object.normalize(note_activity) user = insert(:user) - data = %{ - "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(), - "actor" => user.ap_id, - "type" => "Like", - "object" => object.data["id"], - "published_at" => DateTime.utc_now() |> DateTime.to_iso8601() - } + data = + %{ + "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(), + "actor" => user.ap_id, + "type" => "Like", + "object" => object.data["id"], + "published_at" => DateTime.utc_now() |> DateTime.to_iso8601() + } + |> Map.merge(attrs[:data_attrs] || %{}) %Pleroma.Activity{ data: data |