summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/twitter_api_controller_test.exs
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-04-12 10:41:09 +0000
committerlambda <lain@soykaf.club>2019-04-12 10:41:09 +0000
commit184ae60b217f4e3a79aad538717d1cf35f10291a (patch)
treece7633ae3f388e1cf7618d39512a196ec59c93f3 /test/web/twitter_api/twitter_api_controller_test.exs
parent0a09692c7decdcaa8c15e5f8eaf10d9e7d16a5e5 (diff)
parent9c1b36856b97a7f86e60ad23ef374449c1910c7a (diff)
downloadpleroma-184ae60b217f4e3a79aad538717d1cf35f10291a.tar.gz
pleroma-184ae60b217f4e3a79aad538717d1cf35f10291a.zip
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
-rw-r--r--test/web/twitter_api/twitter_api_controller_test.exs6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index 72b7ea85e..b3e01e943 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -1064,7 +1064,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
token_record = Repo.get_by(Pleroma.PasswordResetToken, user_id: user.id)
Swoosh.TestAssertions.assert_email_sent(
- Pleroma.UserEmail.password_reset_email(user, token_record.token)
+ Pleroma.Emails.UserEmail.password_reset_email(user, token_record.token)
)
end
end
@@ -1163,7 +1163,9 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|> assign(:user, user)
|> post("/api/account/resend_confirmation_email?email=#{user.email}")
- Swoosh.TestAssertions.assert_email_sent(Pleroma.UserEmail.account_confirmation_email(user))
+ Swoosh.TestAssertions.assert_email_sent(
+ Pleroma.Emails.UserEmail.account_confirmation_email(user)
+ )
end
end