Merge branch 'small-jsonld-refactor' into 'develop'

[akkoma] / config / test.exs

diff --git a/config/test.exs b/config/test.exs
index e0461e93d092c9cfe392778ef8812a3d058ed410..1bd11dee44543c1163116c4913ccf811c21f1330 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -21,8 +21,17 @@ config :pleroma, Pleroma.Repo,
   pool: Ecto.Adapters.SQL.Sandbox
 
 # Reduce hash rounds for testing
-config :comeonin, :pbkdf2_rounds, 1
+config :pbkdf2_elixir, rounds: 1
 
 config :pleroma, :websub, Pleroma.Web.WebsubMock
 config :pleroma, :ostatus, Pleroma.Web.OStatusMock
 config :pleroma, :httpoison, HTTPoisonMock
+
+try do
+  import_config "test.secret.exs"
+rescue
+  _ ->
+    IO.puts(
+      "You may want to create test.secret.exs to declare custom database connection parameters."
+    )
+end