diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-11 15:51:52 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-11 15:51:52 +0700 |
| commit | 0f2f7d2cec8297b1b5645643d7584cde561ce628 (patch) | |
| tree | aa618de9dc399de2e3abf37ad9ecf66d8cb9761f /config/test.exs | |
| parent | 22ac2288be498bd6a5a6fefe2dc6d2e260a8dc39 (diff) | |
| parent | e5d553aa45ffa218b0695d7976f012bfc1dcbafe (diff) | |
| download | pleroma-0f2f7d2cec8297b1b5645643d7584cde561ce628.tar.gz pleroma-0f2f7d2cec8297b1b5645643d7584cde561ce628.zip | |
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index fbeba0919..894fa8d3d 100644 --- a/config/test.exs +++ b/config/test.exs @@ -17,6 +17,8 @@ config :pleroma, Pleroma.Captcha, # Print only warnings and errors during test config :logger, level: :warn +config :pleroma, Pleroma.Upload, filters: [], link_name: false + config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads" config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Test @@ -44,7 +46,14 @@ config :web_push_encryption, :vapid_details, "BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4", private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA" -config :pleroma, Pleroma.Jobs, testing: [max_jobs: 2] +config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock + +config :pleroma_job_queue, disabled: true + +config :pleroma, Pleroma.ScheduledActivity, + daily_user_limit: 2, + total_user_limit: 3, + enabled: false try do import_config "test.secret.exs" |