diff options
author | lain <lain@soykaf.club> | 2021-01-05 12:19:39 +0100 |
---|---|---|
committer | lain <lain@soykaf.club> | 2021-01-05 12:19:39 +0100 |
commit | bea69853a234589b48e492b15ddb2449ec61b661 (patch) | |
tree | f5f006864a9d70bc9be0dd28bf2bc0893fb97f3e /test/support | |
parent | 0ec7e9b8e98f6310f19d0b0a6ad82fc9c70a9d47 (diff) | |
parent | b3c36d3f7a637973ab9a16dca03eac763a5ccc68 (diff) | |
download | pleroma-bea69853a234589b48e492b15ddb2449ec61b661.tar.gz pleroma-bea69853a234589b48e492b15ddb2449ec61b661.zip |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
Diffstat (limited to 'test/support')
-rw-r--r-- | test/support/conn_case.ex | 2 | ||||
-rw-r--r-- | test/support/data_case.ex | 2 | ||||
-rw-r--r-- | test/support/mocks.ex | 7 |
3 files changed, 10 insertions, 1 deletions
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex index 02f49c590..f20e3d955 100644 --- a/test/support/conn_case.ex +++ b/test/support/conn_case.ex @@ -138,6 +138,8 @@ defmodule Pleroma.Web.ConnCase do Pleroma.DataCase.stub_pipeline() + Mox.verify_on_exit!() + {:ok, conn: Phoenix.ConnTest.build_conn()} end end diff --git a/test/support/data_case.ex b/test/support/data_case.ex index 5c657c1d9..0b41f0f63 100644 --- a/test/support/data_case.ex +++ b/test/support/data_case.ex @@ -85,6 +85,8 @@ defmodule Pleroma.DataCase do stub_pipeline() + Mox.verify_on_exit!() + :ok end diff --git a/test/support/mocks.ex b/test/support/mocks.ex index a600a6458..442ff5b71 100644 --- a/test/support/mocks.ex +++ b/test/support/mocks.ex @@ -13,7 +13,10 @@ Mox.defmock(Pleroma.Web.ActivityPub.MRFMock, ) Mox.defmock(Pleroma.Web.ActivityPub.ActivityPubMock, - for: Pleroma.Web.ActivityPub.ActivityPub.Persisting + for: [ + Pleroma.Web.ActivityPub.ActivityPub.Persisting, + Pleroma.Web.ActivityPub.ActivityPub.Streaming + ] ) Mox.defmock(Pleroma.Web.ActivityPub.SideEffectsMock, @@ -23,3 +26,5 @@ Mox.defmock(Pleroma.Web.ActivityPub.SideEffectsMock, Mox.defmock(Pleroma.Web.FederatorMock, for: Pleroma.Web.Federator.Publishing) Mox.defmock(Pleroma.ConfigMock, for: Pleroma.Config.Getting) + +Mox.defmock(Pleroma.LoggerMock, for: Pleroma.Logging) |