summaryrefslogtreecommitdiff
path: root/test/web/admin_api/admin_api_controller_test.exs
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@gmail.com>2019-04-17 16:58:08 +0700
committerRoman Chvanikov <chvanikoff@gmail.com>2019-04-17 16:58:08 +0700
commit87013f843853250e8b15696900e09afb92d22aac (patch)
tree72491ebe110dbd191485a5f7aa1b80e6359e848b /test/web/admin_api/admin_api_controller_test.exs
parentdc21181f6504b55afa68de63f170fcb0f1084a6b (diff)
parent8de17c480e4267a46ae8d862a3c8918aa6734c39 (diff)
downloadpleroma-87013f843853250e8b15696900e09afb92d22aac.tar.gz
pleroma-87013f843853250e8b15696900e09afb92d22aac.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
Diffstat (limited to 'test/web/admin_api/admin_api_controller_test.exs')
-rw-r--r--test/web/admin_api/admin_api_controller_test.exs10
1 files changed, 9 insertions, 1 deletions
diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs
index 6d89a0919..b3167a861 100644
--- a/test/web/admin_api/admin_api_controller_test.exs
+++ b/test/web/admin_api/admin_api_controller_test.exs
@@ -317,13 +317,21 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
assert token_record
refute token_record.used
- Swoosh.TestAssertions.assert_email_sent(
+ notify_email = Pleroma.Config.get([:instance, :notify_email])
+ instance_name = Pleroma.Config.get([:instance, :name])
+
+ email =
Pleroma.Emails.UserEmail.user_invitation_email(
user,
token_record,
recipient_email,
recipient_name
)
+
+ Swoosh.TestAssertions.assert_email_sent(
+ from: {instance_name, notify_email},
+ to: {recipient_name, recipient_email},
+ html_body: email.html_body
)
end