Merge branch 'deprecate-public_endpoint' into 'develop'

[akkoma] / config / test.exs

diff --git a/config/test.exs b/config/test.exs
index e482f38c8055ad767470e46539dbca8f14d92350..690c98e40e909b6b3ff4aaa8f85f655f9727c5df 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -53,7 +53,7 @@ config :pleroma, Pleroma.Repo,
 config :pleroma, :dangerzone, override_repo_pool_size: true
 
 # Reduce hash rounds for testing
-config :pbkdf2_elixir, rounds: 1
+config :pleroma, :password, iterations: 1
 
 config :tesla, adapter: Tesla.Mock
 
@@ -115,10 +115,6 @@ config :pleroma, Pleroma.Web.Plugs.RemoteIp, enabled: false
 
 config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
 
-config :pleroma, Pleroma.Uploaders.S3,
-  bucket: nil,
-  streaming_enabled: true
-
 config :tzdata, :autoupdate, :disabled
 
 config :pleroma, :mrf, policies: []