X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Ftest.exs;h=5c6acfead9b7bf1ed6ba96e0d5b1ef3d3c6a3ec0;hb=e3a21bcd45dd1f27a2f6a74041d86c64ad8256e9;hp=04136e1f23d1447bf94d278484c48c3110cfb74b;hpb=b403ea4d2b69cef4434ad68babdfb402d8227847;p=akkoma

diff --git a/config/test.exs b/config/test.exs
index 04136e1f2..5c6acfead 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -9,8 +9,9 @@ config :pleroma, Pleroma.Web.Endpoint,
 # Print only warnings and errors during test
 config :logger, level: :warn
 
-config :pleroma, Pleroma.Upload,
-  uploads: "test/uploads"
+config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"
+
+config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Test
 
 # Configure your database
 config :pleroma, Pleroma.Repo,
@@ -18,13 +19,27 @@ config :pleroma, Pleroma.Repo,
   username: "postgres",
   password: "postgres",
   database: "pleroma_test",
-  hostname: "localhost",
+  hostname: System.get_env("DB_HOST") || "localhost",
   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
+config :tesla, adapter: Tesla.Mock
+
+config :web_push_encryption, :vapid_details,
+  subject: "mailto:administrator@example.com",
+  public_key:
+    "BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4",
+  private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA"
+
+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