From e8537208bd9af701cbfc788ca307b8352306a36b Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Sat, 15 Dec 2018 22:38:39 +0300
Subject: Add a captcha mock for tests

---
 test/support/captcha_mock.ex | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 test/support/captcha_mock.ex

(limited to 'test/support/captcha_mock.ex')

diff --git a/test/support/captcha_mock.ex b/test/support/captcha_mock.ex
new file mode 100644
index 000000000..9d79f2e95
--- /dev/null
+++ b/test/support/captcha_mock.ex
@@ -0,0 +1,10 @@
+defmodule Pleroma.Captcha.Mock do
+  alias Pleroma.Captcha.Service
+  @behaviour Service
+
+  @impl Service
+  def new(), do: %{type: :mock}
+
+  @impl Service
+  def validate(_token, _captcha), do: true
+end
-- 
cgit v1.2.3


From 73576ab64ef00aa012dbabae907e03faa436c212 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Sun, 16 Dec 2018 23:01:44 +0300
Subject: Fix captcha tests

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

(limited to 'test/support/captcha_mock.ex')

diff --git a/test/support/captcha_mock.ex b/test/support/captcha_mock.ex
index 9d79f2e95..560d6c457 100644
--- a/test/support/captcha_mock.ex
+++ b/test/support/captcha_mock.ex
@@ -7,4 +7,7 @@ defmodule Pleroma.Captcha.Mock do
 
   @impl Service
   def validate(_token, _captcha), do: true
+
+  @impl Service
+  def cleanup(_token), do: true
 end
-- 
cgit v1.2.3


From ef6829382aa32c03cf8536422537a9c219bd0035 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Sun, 16 Dec 2018 23:41:11 +0300
Subject: Clean captchas up periodically, not schedule it after theyre created

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

(limited to 'test/support/captcha_mock.ex')

diff --git a/test/support/captcha_mock.ex b/test/support/captcha_mock.ex
index 560d6c457..898aa17b8 100644
--- a/test/support/captcha_mock.ex
+++ b/test/support/captcha_mock.ex
@@ -9,5 +9,5 @@ defmodule Pleroma.Captcha.Mock do
   def validate(_token, _captcha), do: true
 
   @impl Service
-  def cleanup(_token), do: true
+  def cleanup(), do: :ok
 end
-- 
cgit v1.2.3


From 336e37d98f1b86c0332c9f260e27455a14714fa6 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Fri, 21 Dec 2018 00:32:37 +0300
Subject: Make captcha (kocaptcha) stateless

Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
---
 test/support/captcha_mock.ex | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'test/support/captcha_mock.ex')

diff --git a/test/support/captcha_mock.ex b/test/support/captcha_mock.ex
index 898aa17b8..410318dc4 100644
--- a/test/support/captcha_mock.ex
+++ b/test/support/captcha_mock.ex
@@ -6,8 +6,5 @@ defmodule Pleroma.Captcha.Mock do
   def new(), do: %{type: :mock}
 
   @impl Service
-  def validate(_token, _captcha), do: true
-
-  @impl Service
-  def cleanup(), do: :ok
+  def validate(_token, _captcha, _data), do: :ok
 end
-- 
cgit v1.2.3


From 3c08d229db423052d0dd88b8a36fb39b0ae81ead Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sun, 23 Dec 2018 20:11:29 +0000
Subject: tests: add legal boilerplate

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

(limited to 'test/support/captcha_mock.ex')

diff --git a/test/support/captcha_mock.ex b/test/support/captcha_mock.ex
index 898aa17b8..3ab02916f 100644
--- a/test/support/captcha_mock.ex
+++ b/test/support/captcha_mock.ex
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Captcha.Mock do
   alias Pleroma.Captcha.Service
   @behaviour Service
-- 
cgit v1.2.3


From fb82f6fc7c5453e34e619c54a88e64e99deb58b4 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 5 Mar 2019 04:18:43 +0100
Subject: [Credo] Remove parentesis on argument-less functions

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

(limited to 'test/support/captcha_mock.ex')

diff --git a/test/support/captcha_mock.ex b/test/support/captcha_mock.ex
index 9061f2b45..ef4e68bc5 100644
--- a/test/support/captcha_mock.ex
+++ b/test/support/captcha_mock.ex
@@ -7,7 +7,7 @@ defmodule Pleroma.Captcha.Mock do
   @behaviour Service
 
   @impl Service
-  def new(), do: %{type: :mock}
+  def new, do: %{type: :mock}
 
   @impl Service
   def validate(_token, _captcha, _data), do: :ok
-- 
cgit v1.2.3