summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-06-16 13:17:52 +0000
committerlain <lain@soykaf.club>2020-06-16 13:17:52 +0000
commit4baf5ffe739fd99d0e6ab1cd7e22859c14f395c9 (patch)
treed657b3af0d48fbb00504254d416876390b046d6a /test/support
parent1e49bfa9acb4176a161181edcaf04e886c638c42 (diff)
parent32c6576b600e2f24310f429f4b2391f95a5b5ba0 (diff)
downloadpleroma-4baf5ffe739fd99d0e6ab1cd7e22859c14f395c9.tar.gz
pleroma-4baf5ffe739fd99d0e6ab1cd7e22859c14f395c9.zip
Merge branch 'fix/1787-mogrify-args' into 'develop'
Mogrify args in adminFE Closes #1787 See merge request pleroma/pleroma!2616
Diffstat (limited to 'test/support')
-rw-r--r--test/support/factory.ex17
1 files changed, 5 insertions, 12 deletions
diff --git a/test/support/factory.ex b/test/support/factory.ex
index 6e3676aca..e517d5bc6 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -396,24 +396,17 @@ defmodule Pleroma.Factory do
}
end
- def config_factory do
+ def config_factory(attrs \\ %{}) do
%Pleroma.ConfigDB{
- key:
- sequence(:key, fn key ->
- # Atom dynamic registration hack in tests
- "some_key_#{key}"
- |> String.to_atom()
- |> inspect()
- end),
- group: ":pleroma",
+ key: sequence(:key, &String.to_atom("some_key_#{&1}")),
+ group: :pleroma,
value:
sequence(
:value,
- fn key ->
- :erlang.term_to_binary(%{another_key: "#{key}somevalue", another: "#{key}somevalue"})
- end
+ &%{another_key: "#{&1}somevalue", another: "#{&1}somevalue"}
)
}
+ |> merge_attributes(attrs)
end
def marker_factory do