summaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-09-16 14:40:17 +0300
committerMaxim Filippov <colixer@gmail.com>2019-09-16 14:40:17 +0300
commit219dca1b00a60805545dd3de433de285cc944af5 (patch)
treef8ffd4f93bf3f7bcd7ce0b789a18fb425134781a /config/test.exs
parent736165c082d34ef4d52367ea8315c228a1df3944 (diff)
parent409e701ab849475c81073d80a973487d67cadaae (diff)
downloadpleroma-219dca1b00a60805545dd3de433de285cc944af5.tar.gz
pleroma-219dca1b00a60805545dd3de433de285cc944af5.zip
Merge branch 'develop' into feature/return-total-for-reports
Diffstat (limited to 'config/test.exs')
-rw-r--r--config/test.exs6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs
index 567780987..df512b5d7 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -61,7 +61,11 @@ config :web_push_encryption, :vapid_details,
config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
-config :pleroma_job_queue, disabled: true
+config :pleroma, Oban,
+ queues: false,
+ prune: :disabled
+
+config :pleroma, Pleroma.Scheduler, jobs: []
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 2,