diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-05-07 19:28:23 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-05-07 19:28:23 +0200 |
| commit | b403ea4d2b69cef4434ad68babdfb402d8227847 (patch) | |
| tree | d07607b3387c89f4310881132a9e10a5389a5439 /test/support/builders | |
| parent | a9b2ad17596d1b6deca646239a95e94dc644ebf3 (diff) | |
| parent | 60b4b0d725aefdca3eedd2d7708b0c96ee60c5f4 (diff) | |
| download | pleroma-b403ea4d2b69cef4434ad68babdfb402d8227847.tar.gz pleroma-b403ea4d2b69cef4434ad68babdfb402d8227847.zip | |
Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity
Diffstat (limited to 'test/support/builders')
| -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 0f9cd0d15..16011edbf 100644 --- a/test/support/builders/activity_builder.ex +++ b/test/support/builders/activity_builder.ex @@ -5,7 +5,7 @@ defmodule Pleroma.Builders.ActivityBuilder do def build(data \\ %{}, opts \\ %{}) do user = opts[:user] || Pleroma.Factory.insert(:user) activity = %{ - "id" => 1, + "id" => Pleroma.Web.ActivityPub.ActivityPub.generate_object_id, "actor" => user.ap_id, "to" => ["https://www.w3.org/ns/activitystreams#Public"], "object" => %{ @@ -23,7 +23,7 @@ defmodule Pleroma.Builders.ActivityBuilder do def insert_list(times, data \\ %{}, opts \\ %{}) do Enum.map(1..times, fn (n) -> - {:ok, activity} = insert(Map.merge(data, %{"id" => n})) + {:ok, activity} = insert(data) activity end) end |