summaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-05-01 12:32:17 -0500
committerMark Felder <feld@FreeBSD.org>2019-05-01 12:32:17 -0500
commit3c4cab9be18ff543d025177b418ddd0b16050e68 (patch)
tree3b4d32c978ecfaa656256509bf390d6ca22c6679 /config/test.exs
parent9a98f48ec3f438e543a5a621624401bb22a0d44a (diff)
parent41d78f91083b5017e6085150bfae71a842f5c47f (diff)
downloadpleroma-3c4cab9be18ff543d025177b418ddd0b16050e68.tar.gz
pleroma-3c4cab9be18ff543d025177b418ddd0b16050e68.zip
Merge branch 'develop' into update-oauth-template
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,