diff options
| author | lain <lain@soykaf.club> | 2020-09-23 09:16:00 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-23 09:16:00 +0000 |
| commit | a6c14041c49df0dc850204723cfc1f242ded8aa2 (patch) | |
| tree | 559fe96b7f65cd750a4bab5e9a117c43829c800f /test/web/admin_api/controllers | |
| parent | 518c0f2962ab36660157d7cbc995d1f4562728b3 (diff) | |
| parent | 34235bc02a88718b1d5a9d7fa2437784b91bb692 (diff) | |
| download | pleroma-a6c14041c49df0dc850204723cfc1f242ded8aa2.tar.gz pleroma-a6c14041c49df0dc850204723cfc1f242ded8aa2.zip | |
Merge branch 'develop' into 'issue/1975'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/web/admin_api/controllers')
| -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 |