From 33f042780909f3478597a8ecd10a2bf31e99dcc9 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 29 Jul 2020 16:07:22 -0500
Subject: Expose seconds_valid in Pleroma Captcha API endpoint

---
 test/support/captcha_mock.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'test/support')

diff --git a/test/support/captcha_mock.ex b/test/support/captcha_mock.ex
index 7b0c1d5af..2ed2ba3b4 100644
--- a/test/support/captcha_mock.ex
+++ b/test/support/captcha_mock.ex
@@ -16,7 +16,8 @@ defmodule Pleroma.Captcha.Mock do
       type: :mock,
       token: "afa1815e14e29355e6c8f6b143a39fa2",
       answer_data: @solution,
-      url: "https://example.org/captcha.png"
+      url: "https://example.org/captcha.png",
+      seconds_valid: 300
     }
 
   @impl Service
-- 
cgit v1.2.3


From 77b48cb4ce81165a3a4f28e91b8f22dd510d3d00 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 16:36:55 -0500
Subject: Factory: Add report_activity_factory

---
 test/support/factory.ex | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'test/support')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index 635d83650..4c09d65b6 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -297,6 +297,30 @@ defmodule Pleroma.Factory do
     }
   end
 
+  def report_activity_factory(attrs \\ %{}) do
+    user = attrs[:user] || insert(:user)
+    activity = attrs[:activity] || insert(:note_activity)
+    state = attrs[:state] || "open"
+
+    data = %{
+      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
+      "actor" => user.ap_id,
+      "type" => "Flag",
+      "object" => [activity.actor, activity.data["id"]],
+      "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
+      "to" => [],
+      "cc" => [activity.actor],
+      "context" => activity.data["context"],
+      "state" => state,
+    }
+
+    %Pleroma.Activity{
+      data: data,
+      actor: data["actor"],
+      recipients: data["to"] ++ data["cc"]
+    }
+  end
+
   def oauth_app_factory do
     %Pleroma.Web.OAuth.App{
       client_name: sequence(:client_name, &"Some client #{&1}"),
-- 
cgit v1.2.3


From f9301044ed9c80314d1c313035359956cf5dbc1a Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 16:37:33 -0500
Subject: Add ReportNote test

---
 test/support/factory.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/support')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index 4c09d65b6..486eda8da 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -311,7 +311,7 @@ defmodule Pleroma.Factory do
       "to" => [],
       "cc" => [activity.actor],
       "context" => activity.data["context"],
-      "state" => state,
+      "state" => state
     }
 
     %Pleroma.Activity{
-- 
cgit v1.2.3