diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-16 18:44:07 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-16 18:44:07 +0000 |
| commit | 73df3046e014ae16e03f16a9c82921652cefcb54 (patch) | |
| tree | 00a5d0bb027e65bfa3e7894b489dad7226aa645b /test/web/twitter_api/twitter_api_test.exs | |
| parent | 02a53d00c93969ff99a460f69e92be5af2628691 (diff) | |
| parent | c5d0fffeaf64123334f62343d752467683a67229 (diff) | |
| download | pleroma-73df3046e014ae16e03f16a9c82921652cefcb54.tar.gz | |
Merge branch 'feature/788-separate-email-addresses' into 'develop'
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
Diffstat (limited to 'test/web/twitter_api/twitter_api_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_test.exs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index 8781061d4..4c9ae2da8 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -325,8 +325,15 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do assert user.info.confirmation_pending + email = Pleroma.Emails.UserEmail.account_confirmation_email(user) + + notify_email = Pleroma.Config.get([:instance, :notify_email]) + instance_name = Pleroma.Config.get([:instance, :name]) + Swoosh.TestAssertions.assert_email_sent( - Pleroma.Emails.UserEmail.account_confirmation_email(user) + from: {instance_name, notify_email}, + to: {user.name, user.email}, + html_body: email.html_body ) end |