diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-09 19:41:43 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-09 19:41:43 +0300 |
| commit | 2b821036c4bd84cee51c9fcace5a4b3764c3bba1 (patch) | |
| tree | 811d75ef4b0442f3f2102d873fab4e10c777e7f1 /test/support | |
| parent | 5876a9cb79e53f932d63e457610852031669a222 (diff) | |
| parent | 0d2c13a119302d0d217a7cb61c28a01c620b1b61 (diff) | |
| download | pleroma-2b821036c4bd84cee51c9fcace5a4b3764c3bba1.tar.gz | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'test/support')
| -rw-r--r-- | test/support/builders/user_builder.ex | 3 | ||||
| -rw-r--r-- | test/support/factory.ex | 3 |
2 files changed, 4 insertions, 2 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) diff --git a/test/support/factory.ex b/test/support/factory.ex index 35ba523a1..314f26ec9 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -31,7 +31,8 @@ defmodule Pleroma.Factory do nickname: sequence(:nickname, &"nick#{&1}"), password_hash: Comeonin.Pbkdf2.hashpwsalt("test"), bio: sequence(:bio, &"Tester Number #{&1}"), - last_digest_emailed_at: NaiveDateTime.utc_now() + last_digest_emailed_at: NaiveDateTime.utc_now(), + notification_settings: %Pleroma.User.NotificationSetting{} } %{ |