Merge branch 'feature/integration_tesla' into 'develop'

[akkoma] / config / test.exs

diff --git a/config/test.exs b/config/test.exs
index 0c73f892ac987351ed6183b1a7ebd642bffeaabb..6f6227c20a2d8e13060162e08b463c4a2a025c26 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -9,7 +9,7 @@ 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"
 
 # Configure your database
 config :pleroma, Pleroma.Repo,
@@ -21,11 +21,11 @@ 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
 
 try do
   import_config "test.secret.exs"