summaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-09-19 07:35:34 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-09-19 07:35:34 +0300
commitd4ed3a35b8aa34cd968113970bbab445eb251703 (patch)
treedbbf93e12e33932d7774ab72fb54ff0ee08031d1 /config/test.exs
parent2b40e57a72f3ee3209b204a5ae5e0221b1d66c7e (diff)
parentf95a2b2cda236f7c0e5ced2a4698e2b10d99fa53 (diff)
downloadpleroma-d4ed3a35b8aa34cd968113970bbab445eb251703.tar.gz
pleroma-d4ed3a35b8aa34cd968113970bbab445eb251703.zip
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
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,