Merge branch 'develop' into feature/bulk-confirmation

[akkoma] / config / test.exs

diff --git a/config/test.exs b/config/test.exs
index d45c36b7bcd8e1f9dd561ff32475f784a5b04e5c..93a0e2a61c032d63f12850e392b65fc8a44ba6e3 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -19,9 +19,17 @@ config :logger, :console,
   level: :warn,
   format: "\n[$level] $message\n"
 
+config :pleroma, :fed_sockets,
+  enabled: false,
+  connection_duration: 5,
+  rejection_duration: 5
+
 config :pleroma, :auth, oauth_consumer_strategies: []
 
-config :pleroma, Pleroma.Upload, filters: [], link_name: false
+config :pleroma, Pleroma.Upload,
+  filters: [],
+  link_name: false,
+  default_description: :filename
 
 config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"
 
@@ -111,7 +119,14 @@ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
 
 config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
 
-config :pleroma, :instances_favicons, enabled: true
+config :pleroma, Pleroma.Uploaders.S3,
+  bucket: nil,
+  streaming_enabled: true,
+  public_endpoint: nil
+
+config :tzdata, :autoupdate, :disabled
+
+config :pleroma, :mrf, policies: []
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"