From 7dffaef4799b0e867e91e19b76567c0e1a19bb43 Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Tue, 23 Jun 2020 18:16:47 +0300
Subject: tests consistency

---
 test/support/captcha/mock.ex | 28 ++++++++++++++++++++++++++++
 test/support/captcha_mock.ex | 28 ----------------------------
 2 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 test/support/captcha/mock.ex
 delete mode 100644 test/support/captcha_mock.ex

(limited to 'test/support')

diff --git a/test/support/captcha/mock.ex b/test/support/captcha/mock.ex
new file mode 100644
index 000000000..2ed2ba3b4
--- /dev/null
+++ b/test/support/captcha/mock.ex
@@ -0,0 +1,28 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Captcha.Mock do
+  alias Pleroma.Captcha.Service
+  @behaviour Service
+
+  @solution "63615261b77f5354fb8c4e4986477555"
+
+  def solution, do: @solution
+
+  @impl Service
+  def new,
+    do: %{
+      type: :mock,
+      token: "afa1815e14e29355e6c8f6b143a39fa2",
+      answer_data: @solution,
+      url: "https://example.org/captcha.png",
+      seconds_valid: 300
+    }
+
+  @impl Service
+  def validate(_token, captcha, captcha) when not is_nil(captcha), do: :ok
+
+  def validate(_token, captcha, answer),
+    do: {:error, "Invalid CAPTCHA captcha: #{inspect(captcha)} ; answer: #{inspect(answer)}"}
+end
diff --git a/test/support/captcha_mock.ex b/test/support/captcha_mock.ex
deleted file mode 100644
index 2ed2ba3b4..000000000
--- a/test/support/captcha_mock.ex
+++ /dev/null
@@ -1,28 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Captcha.Mock do
-  alias Pleroma.Captcha.Service
-  @behaviour Service
-
-  @solution "63615261b77f5354fb8c4e4986477555"
-
-  def solution, do: @solution
-
-  @impl Service
-  def new,
-    do: %{
-      type: :mock,
-      token: "afa1815e14e29355e6c8f6b143a39fa2",
-      answer_data: @solution,
-      url: "https://example.org/captcha.png",
-      seconds_valid: 300
-    }
-
-  @impl Service
-  def validate(_token, captcha, captcha) when not is_nil(captcha), do: :ok
-
-  def validate(_token, captcha, answer),
-    do: {:error, "Invalid CAPTCHA captcha: #{inspect(captcha)} ; answer: #{inspect(answer)}"}
-end
-- 
cgit v1.2.3


From 8bacdc36806efd01a7897359ff0fd2c8e24730d2 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 13 Oct 2020 09:45:08 -0500
Subject: Change user.discoverable field to user.is_discoverable

---
 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 fb82be0c4..80b882ee4 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -31,7 +31,7 @@ defmodule Pleroma.Factory do
       nickname: sequence(:nickname, &"nick#{&1}"),
       password_hash: Pbkdf2.hash_pwd_salt("test"),
       bio: sequence(:bio, &"Tester Number #{&1}"),
-      discoverable: true,
+      is_discoverable: true,
       last_digest_emailed_at: NaiveDateTime.utc_now(),
       last_refreshed_at: NaiveDateTime.utc_now(),
       notification_settings: %Pleroma.User.NotificationSetting{},
-- 
cgit v1.2.3