diff options
| author | lain <lain@soykaf.club> | 2020-09-23 09:05:52 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-23 09:05:52 +0000 |
| commit | 34235bc02a88718b1d5a9d7fa2437784b91bb692 (patch) | |
| tree | 8e862acf9257c49303e16d8224eea86233624f52 /test/web/admin_api/controllers/admin_api_controller_test.exs | |
| parent | 02f12ec6253093d8bedaf84d78d0f7e533745e1b (diff) | |
| parent | 9d6415de157ddf6effb154b354fd6410dba8aae6 (diff) | |
| download | pleroma-34235bc02a88718b1d5a9d7fa2437784b91bb692.tar.gz pleroma-34235bc02a88718b1d5a9d7fa2437784b91bb692.zip | |
Merge branch 'email-fix-develop' into 'develop'
Allow emails to be sent again (develop)
Closes #2172
See merge request pleroma/pleroma!3025
Diffstat (limited to 'test/web/admin_api/controllers/admin_api_controller_test.exs')
| -rw-r--r-- | test/web/admin_api/controllers/admin_api_controller_test.exs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/web/admin_api/controllers/admin_api_controller_test.exs b/test/web/admin_api/controllers/admin_api_controller_test.exs index e4d3512de..cba6b43d3 100644 --- a/test/web/admin_api/controllers/admin_api_controller_test.exs +++ b/test/web/admin_api/controllers/admin_api_controller_test.exs @@ -1977,7 +1977,12 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do }" ObanHelpers.perform_all() - assert_email_sent(Pleroma.Emails.UserEmail.account_confirmation_email(first_user)) + + Pleroma.Emails.UserEmail.account_confirmation_email(first_user) + # temporary hackney fix until hackney max_connections bug is fixed + # https://git.pleroma.social/pleroma/pleroma/-/issues/2101 + |> Swoosh.Email.put_private(:hackney_options, ssl_options: [versions: [:"tlsv1.2"]]) + |> assert_email_sent() end end |