summaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-04-22 13:08:30 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-04-22 13:08:30 +0700
commite8c2f9a73a37636a9a8ed5c2998617b841f482da (patch)
tree4b194e631d2bbb58b8522c3d74a0b0c2ea09fedd /config/test.exs
parent38926a063a39c4d4387049f5d364f72a9f8bd2de (diff)
parent7fcbda702e76b6390076c28832f5aea80086d15a (diff)
downloadpleroma-e8c2f9a73a37636a9a8ed5c2998617b841f482da.tar.gz
pleroma-e8c2f9a73a37636a9a8ed5c2998617b841f482da.zip
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
Diffstat (limited to 'config/test.exs')
-rw-r--r--config/test.exs6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs
index 894fa8d3d..f93bc5994 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -21,7 +21,11 @@ config :pleroma, Pleroma.Upload, filters: [], link_name: false
config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"
-config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Test
+config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test
+
+config :pleroma, :instance,
+ email: "admin@example.com",
+ notify_email: "noreply@example.com"
# Configure your database
config :pleroma, Pleroma.Repo,