projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
[akkoma]
/
test
/
web
/
admin_api
/
admin_api_controller_test.exs
diff --git
a/test/web/admin_api/admin_api_controller_test.exs
b/test/web/admin_api/admin_api_controller_test.exs
index d44392c9d0afa4f20e64c7996e3ef66a0a19bc2e..b3167a861007900dc7642e0de6a38b88c44859ad 100644
(file)
--- 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
assert token_record
refute token_record.used
- Swoosh.TestAssertions.assert_email_sent(
- Pleroma.UserEmail.user_invitation_email(
+ 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
)
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
)
end