X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Ftest.exs;h=5c6acfead9b7bf1ed6ba96e0d5b1ef3d3c6a3ec0;hb=0ee51992a89319c3c0d0f7485f1c4e9e2953bc8a;hp=e0461e93d092c9cfe392778ef8812a3d058ed410;hpb=4afbef39f49948ddd3b1cd1bbda58ff7e3ac2785;p=akkoma

diff --git a/config/test.exs b/config/test.exs
index e0461e93d..5c6acfead 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -9,7 +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,
@@ -21,8 +23,23 @@ 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
+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