Merge branch 'develop' into gun

[akkoma] / config / test.exs

diff --git a/config/test.exs b/config/test.exs
index a17886265e44de5d938115601a906d825c9e832b..040e67e4ab9917cc5d64dc9bf13aea11f516c728 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -90,8 +90,12 @@ config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
 
 config :pleroma, :modules, runtime_dir: "test/fixtures/modules"
 
+config :pleroma, Pleroma.Gun, Pleroma.GunMock
+
 config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: true
 
+config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else