diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-31 14:25:43 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-31 14:25:43 +0300 |
| commit | e890ea7e821d61fca75084d46f70ed125acf1fc8 (patch) | |
| tree | 7994c0be9f90b39a9ed46bbfd9f04fce70a14671 /config/test.exs | |
| parent | cd78e63a2528ab813088d5e44a026f6bb05b344b (diff) | |
| parent | 6d33c89c4d27a1b52e69e1c14b408726410a6326 (diff) | |
| download | pleroma-e890ea7e821d61fca75084d46f70ed125acf1fc8.tar.gz pleroma-e890ea7e821d61fca75084d46f70ed125acf1fc8.zip | |
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/config/test.exs b/config/test.exs index 62f2a04d2..0ef809ac1 100644 --- a/config/test.exs +++ b/config/test.exs @@ -88,11 +88,10 @@ config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock -try do +if File.exists?("./config/test.secret.exs") do 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 |