diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-17 09:24:08 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-17 09:24:08 +0300 |
| commit | a879c396bb3a07929d4821ef2c29610808962c6d (patch) | |
| tree | c0e64cdda3a4ab59d2fbdd25db65d8d795dba6c6 /test/support | |
| parent | 22fc271e23a5dd1570ea7429b563f6edc42613c4 (diff) | |
| parent | 804b961d3c8e0034c7b6057a164126e5d01a084b (diff) | |
| download | pleroma-a879c396bb3a07929d4821ef2c29610808962c6d.tar.gz pleroma-a879c396bb3a07929d4821ef2c29610808962c6d.zip | |
Merge branch 'develop' into feature/tag_feed
Diffstat (limited to 'test/support')
| -rw-r--r-- | test/support/builders/user_builder.ex | 3 | ||||
| -rw-r--r-- | test/support/channel_case.ex | 1 | ||||
| -rw-r--r-- | test/support/factory.ex | 3 |
3 files changed, 5 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/channel_case.ex b/test/support/channel_case.ex index 466d8986f..4a4585844 100644 --- a/test/support/channel_case.ex +++ b/test/support/channel_case.ex @@ -23,6 +23,7 @@ defmodule Pleroma.Web.ChannelCase do quote do # Import conveniences for testing with channels use Phoenix.ChannelTest + use Pleroma.Tests.Helpers # The default endpoint for testing @endpoint Pleroma.Web.Endpoint 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{} } %{ |