diff options
| author | lain <lain@soykaf.club> | 2019-08-14 15:30:40 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-08-14 15:30:40 +0200 |
| commit | 560dbad538ba978d00116b1b037502ba2185cb5e (patch) | |
| tree | 1f133f4ae7480228fbf55a8e5741c0e60bdf24d0 /test/support | |
| parent | 2674db14a2ee29e98265c0c0b1db412835b6bbed (diff) | |
| parent | 744e2ce8b4286c41dbea33c1b918bc92b774307e (diff) | |
| download | pleroma-560dbad538ba978d00116b1b037502ba2185cb5e.tar.gz | |
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
Diffstat (limited to 'test/support')
| -rw-r--r-- | test/support/builders/user_builder.ex | 3 | ||||
| -rw-r--r-- | test/support/factory.ex | 3 | ||||
| -rw-r--r-- | test/support/mrf_module_mock.ex | 13 |
3 files changed, 17 insertions, 2 deletions
diff --git a/test/support/builders/user_builder.ex b/test/support/builders/user_builder.ex index f58e1b0ad..6da16f71a 100644 --- a/test/support/builders/user_builder.ex +++ b/test/support/builders/user_builder.ex @@ -9,7 +9,8 @@ defmodule Pleroma.Builders.UserBuilder do nickname: "testname", password_hash: Comeonin.Pbkdf2.hashpwsalt("test"), bio: "A tester.", - ap_id: "some id" + ap_id: "some id", + last_digest_emailed_at: NaiveDateTime.truncate(NaiveDateTime.utc_now(), :second) } Map.merge(user, data) diff --git a/test/support/factory.ex b/test/support/factory.ex index 8f638b98f..1787c1088 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}"), - info: %{} + info: %{}, + last_digest_emailed_at: NaiveDateTime.utc_now() } %{ diff --git a/test/support/mrf_module_mock.ex b/test/support/mrf_module_mock.ex new file mode 100644 index 000000000..12c7e22bc --- /dev/null +++ b/test/support/mrf_module_mock.ex @@ -0,0 +1,13 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule MRFModuleMock do + @behaviour Pleroma.Web.ActivityPub.MRF + + @impl true + def filter(message), do: {:ok, message} + + @impl true + def describe, do: {:ok, %{mrf_module_mock: "some config data"}} +end |