diff options
author | Mark Felder <feld@FreeBSD.org> | 2019-12-11 15:02:53 -0600 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2019-12-11 15:02:53 -0600 |
commit | 9ef912aecfbeef670db0614ec2014321c37f3b7a (patch) | |
tree | 69eb0b5e11ca321e1ba8ca794171bf0cb425d16d /test/support/builders/user_builder.ex | |
parent | e21afdb7c76c9773aeb51e37ff3bc2874e7a74f7 (diff) | |
parent | 92b4a1aa1bc750bb077ae45c422967f9712e247d (diff) | |
download | pleroma-9ef912aecfbeef670db0614ec2014321c37f3b7a.tar.gz pleroma-9ef912aecfbeef670db0614ec2014321c37f3b7a.zip |
Merge branch 'develop' into issue/1411
Diffstat (limited to 'test/support/builders/user_builder.ex')
-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..fcfea666f 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), + notification_settings: %Pleroma.User.NotificationSetting{} } Map.merge(user, data) |