summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorSean King <seanking2919@protonmail.com>2021-07-10 11:04:16 -0600
committerSean King <seanking2919@protonmail.com>2021-07-10 11:04:16 -0600
commit5d279a22b162e7d8a871db1b9368a888e92ea167 (patch)
tree1d89f3c93ee1dc46b185f6d438828fb0b572e6be /test/support
parent26d2c677b78b7cc22a98dfe4648e5b3f5b4da3ea (diff)
parentaa9a6c3c056fde45b4c13c9c873cef9492b279e9 (diff)
downloadpleroma-5d279a22b162e7d8a871db1b9368a888e92ea167.tar.gz
pleroma-5d279a22b162e7d8a871db1b9368a888e92ea167.zip
Merge develop branch upstream
Diffstat (limited to 'test/support')
-rw-r--r--test/support/helpers.ex3
-rw-r--r--test/support/mrf_module_mock.ex2
2 files changed, 2 insertions, 3 deletions
diff --git a/test/support/helpers.ex b/test/support/helpers.ex
index 856a6a376..34f1505d0 100644
--- a/test/support/helpers.ex
+++ b/test/support/helpers.ex
@@ -42,8 +42,7 @@ defmodule Pleroma.Tests.Helpers do
# Displaying a warning to prevent unintentional clearing of all but one keys in section
if Keyword.keyword?(temp_setting) and length(temp_setting) == 1 do
Logger.warn(
- "Please change to `clear_config([section]); clear_config([section, key], value)`: " <>
- "#{inspect(config_path)}, #{inspect(temp_setting)}"
+ "Please change `clear_config([section], key: value)` to `clear_config([section, key], value)`"
)
end
diff --git a/test/support/mrf_module_mock.ex b/test/support/mrf_module_mock.ex
index 4dfdeb3b4..4d21d7fe0 100644
--- a/test/support/mrf_module_mock.ex
+++ b/test/support/mrf_module_mock.ex
@@ -3,7 +3,7 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule MRFModuleMock do
- @behaviour Pleroma.Web.ActivityPub.MRF
+ @behaviour Pleroma.Web.ActivityPub.MRF.Policy
@impl true
def filter(message), do: {:ok, message}