Merge branch 'feld-test.secret' into 'develop'

Make it possible to use custom database connection parameters

See merge request pleroma/pleroma!143

diff --git a/config/test.exs b/config/test.exs
index e0461e93d092c9cfe392778ef8812a3d058ed410..0c73f892ac987351ed6183b1a7ebd642bffeaabb 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -26,3 +26,12 @@ config :comeonin, :pbkdf2_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