projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/integration_tesla' into 'develop'
[akkoma]
/
config
/
test.exs
diff --git
a/config/test.exs
b/config/test.exs
index e13696d5c2848167113a94275d1ec1a559bdb8f3..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
# Print only warnings and errors during test
config :logger, level: :warn
-config :pleroma, Pleroma.Upload, uploads: "test/uploads"
+config :pleroma, Pleroma.Upload
ers.Local
, uploads: "test/uploads"
# Configure your database
config :pleroma, Pleroma.Repo,
# Configure your database
config :pleroma, Pleroma.Repo,
@@
-21,17
+21,17
@@
config :pleroma, Pleroma.Repo,
pool: Ecto.Adapters.SQL.Sandbox
# Reduce hash rounds for testing
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, :websub, Pleroma.Web.WebsubMock
config :pleroma, :ostatus, Pleroma.Web.OStatusMock
-config :
pleroma, :httpoison, HTTPoison
Mock
+config :
tesla, adapter: Tesla.
Mock
try do
import_config "test.secret.exs"
rescue
_ ->
IO.puts(
try do
import_config "test.secret.exs"
rescue
_ ->
IO.puts(
- "You may want to create test.secret.exs to declare custom database connection parame
n
ters."
+ "You may want to create test.secret.exs to declare custom database connection parameters."
)
end
)
end