diff options
author | lain <lain@soykaf.club> | 2019-11-05 12:02:45 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-11-05 12:02:45 +0000 |
commit | 21716aa594064d5f4f4a91a8b40a679775709e1d (patch) | |
tree | 660f575029e4eaf8cf5577049ab67ed1902a04a2 /test/support/builders | |
parent | a43b899e94c499a9b5cb1a072fe4b96f0f02696f (diff) | |
parent | b7de4ad0828078ed5aa03d243319855ce3eb95f8 (diff) | |
download | pleroma-1.1.4.tar.gz |
Merge branch 'release/1.1.4' into 'stable'v1.1.4
Release/1.1.4 - user.info fix plus NOT NULL for user.info
See merge request pleroma/pleroma!1927
Diffstat (limited to 'test/support/builders')
-rw-r--r-- | test/support/builders/user_builder.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/support/builders/user_builder.ex b/test/support/builders/user_builder.ex index 6da16f71a..4bdaddc4a 100644 --- a/test/support/builders/user_builder.ex +++ b/test/support/builders/user_builder.ex @@ -10,7 +10,8 @@ defmodule Pleroma.Builders.UserBuilder do password_hash: Comeonin.Pbkdf2.hashpwsalt("test"), bio: "A tester.", ap_id: "some id", - last_digest_emailed_at: NaiveDateTime.truncate(NaiveDateTime.utc_now(), :second) + last_digest_emailed_at: NaiveDateTime.truncate(NaiveDateTime.utc_now(), :second), + info: %{} } Map.merge(user, data) |