projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'suggestion-api-restriction' into 'develop'
[akkoma]
/
config
/
test.exs
diff --git
a/config/test.exs
b/config/test.exs
index 5d91279a22ae32927b22760825d6d3e0b73d7e73..1bd11dee44543c1163116c4913ccf811c21f1330 100644
(file)
--- a/
config/test.exs
+++ b/
config/test.exs
@@
-9,8
+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, uploads: "test/uploads"
# Configure your database
config :pleroma, Pleroma.Repo,
# Configure your database
config :pleroma, Pleroma.Repo,
@@
-18,11
+17,21
@@
config :pleroma, Pleroma.Repo,
username: "postgres",
password: "postgres",
database: "pleroma_test",
username: "postgres",
password: "postgres",
database: "pleroma_test",
- hostname: "localhost",
+ hostname:
System.get_env("DB_HOST") ||
"localhost",
pool: Ecto.Adapters.SQL.Sandbox
pool: Ecto.Adapters.SQL.Sandbox
-
# Reduce hash rounds for testing
# 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, :httpoison, HTTPoisonMock
-config :pleroma, :websub_verifier, Pleroma.Web.WebsubMock
+try do
+ import_config "test.secret.exs"
+rescue
+ _ ->
+ IO.puts(
+ "You may want to create test.secret.exs to declare custom database connection parameters."
+ )
+end