projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1149-oban-job-queue' into 'develop'
[akkoma]
/
config
/
test.exs
diff --git
a/config/test.exs
b/config/test.exs
index f897b5d48e62d23f6457bf40f488f5a33412b4f5..df512b5d7c59f5422173d6c07dd1de4b67b3096e 100644
(file)
--- a/
config/test.exs
+++ b/
config/test.exs
@@
-61,12
+61,12
@@
config :web_push_encryption, :vapid_details,
config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
-config :pleroma_job_queue, disabled: true
-
config :pleroma, Oban,
queues: false,
prune: :disabled
config :pleroma, Oban,
queues: false,
prune: :disabled
+config :pleroma, Pleroma.Scheduler, jobs: []
+
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 2,
total_user_limit: 3,
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 2,
total_user_limit: 3,
@@
-75,7
+75,8
@@
config :pleroma, Pleroma.ScheduledActivity,
config :pleroma, :rate_limit,
search: [{1000, 30}, {1000, 30}],
app_account_creation: {10_000, 5},
config :pleroma, :rate_limit,
search: [{1000, 30}, {1000, 30}],
app_account_creation: {10_000, 5},
- password_reset: {1000, 30}
+ password_reset: {1000, 30},
+ ap_routes: nil
config :pleroma, :http_security, report_uri: "https://endpoint.com"
config :pleroma, :http_security, report_uri: "https://endpoint.com"
@@
-89,11
+90,10
@@
config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3
config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
-
try
do
+
if File.exists?("./config/test.secret.exs")
do
import_config "test.secret.exs"
import_config "test.secret.exs"
-rescue
- _ ->
- IO.puts(
- "You may want to create test.secret.exs to declare custom database connection parameters."
- )
+else
+ IO.puts(
+ "You may want to create test.secret.exs to declare custom database connection parameters."
+ )
end
end