Merge branch 'develop' into tests/mastodon_api_controller.ex

[akkoma] / config / test.exs

diff --git a/config/test.exs b/config/test.exs
index 567780987d253f3b41b548871a6f22e6e83fb206..da2778aa749ef6b32052f0bce6ae06f91b72eb47 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -30,7 +30,8 @@ config :pleroma, :instance,
   notify_email: "noreply@example.com",
   skip_thread_containment: false,
   federating: false,
-  external_user_synchronization: false
+  external_user_synchronization: false,
+  static_dir: "test/instance_static/"
 
 config :pleroma, :activitypub, sign_object_fetches: false
 
@@ -61,7 +62,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,