summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-06-19 14:56:50 +0200
committerlain <lain@soykaf.club>2020-06-19 14:56:50 +0200
commit7e488cd4a7ac038dfe8a1f5b204cb134bb5ba549 (patch)
treea35a08cb24761e72c4be20b97a1833fdb26ca682 /test/support
parent015f9258a9bd1430ab079f449b118b664c3b9664 (diff)
parentd772361e6209e6b5733e9fe52b3671cd222060b3 (diff)
downloadpleroma-7e488cd4a7ac038dfe8a1f5b204cb134bb5ba549.tar.gz
pleroma-7e488cd4a7ac038dfe8a1f5b204cb134bb5ba549.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
Diffstat (limited to 'test/support')
-rw-r--r--test/support/factory.ex20
1 files changed, 7 insertions, 13 deletions
diff --git a/test/support/factory.ex b/test/support/factory.ex
index 6e3676aca..6e22b66a4 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -42,7 +42,8 @@ defmodule Pleroma.Factory do
user
| ap_id: User.ap_id(user),
follower_address: User.ap_followers(user),
- following_address: User.ap_following(user)
+ following_address: User.ap_following(user),
+ raw_bio: user.bio
}
end
@@ -396,24 +397,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