Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity

[akkoma] / config / test.exs

diff --git a/config/test.exs b/config/test.exs
index 07f49d3e9eb85c0a081fbcf86029fd19ee5408b9..04136e1f23d1447bf94d278484c48c3110cfb74b 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -9,6 +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"
+
 # Configure your database
 config :pleroma, Pleroma.Repo,
   adapter: Ecto.Adapters.Postgres,
@@ -21,3 +24,7 @@ config :pleroma, Pleroma.Repo,
 
 # Reduce hash rounds for testing
 config :comeonin, :pbkdf2_rounds, 1
+
+config :pleroma, :websub, Pleroma.Web.WebsubMock
+config :pleroma, :ostatus, Pleroma.Web.OStatusMock
+config :pleroma, :httpoison, HTTPoisonMock