Merge branch 'develop' into 'from/upstream-develop/tusooa/edits'

# Conflicts:
#   lib/pleroma/constants.ex

1 files changed, 12 insertions, 0 deletions

diff --git a/test/support/factory.ex b/test/support/factory.ex
index aaadae9bd..b01aff3ab 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -639,4 +639,16 @@ defmodule Pleroma.Factory do
       context: ["home"]
     }
   end
+
+  def announcement_factory(params \\ %{}) do
+    data = Map.get(params, :data, %{})
+
+    {_, params} = Map.pop(params, :data)
+
+    %Pleroma.Announcement{
+      data: Map.merge(%{"content" => "test announcement", "all_day" => false}, data)
+    }
+    |> Map.merge(params)
+    |> Pleroma.Announcement.add_rendered_properties()
+  end
 end