diff options
| author | lain <lain@soykaf.club> | 2021-01-05 10:48:32 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-05 10:48:32 +0100 |
| commit | d44850d7a5d1303c1c9d185fc5eb6642823b3ec4 (patch) | |
| tree | 886ebba66ac2f49d51036bf37251c488fff2cf42 /config/test.exs | |
| parent | e1e7e4d379a67779a799049728d143eee2b88a7e (diff) | |
| parent | b3c36d3f7a637973ab9a16dca03eac763a5ccc68 (diff) | |
| download | pleroma-d44850d7a5d1303c1c9d185fc5eb6642823b3ec4.tar.gz pleroma-d44850d7a5d1303c1c9d185fc5eb6642823b3ec4.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index a85881592..7fc457463 100644 --- a/config/test.exs +++ b/config/test.exs @@ -134,6 +134,10 @@ config :pleroma, :pipeline, config :pleroma, :cachex, provider: Pleroma.CachexMock +config :pleroma, :side_effects, + ap_streamer: Pleroma.Web.ActivityPub.ActivityPubMock, + logger: Pleroma.LoggerMock + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |