diff options
| author | lain <lain@soykaf.club> | 2020-09-23 11:49:19 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-23 11:49:19 +0000 |
| commit | 436d1a3c41fc92183efffb81cc041ca270025d02 (patch) | |
| tree | a5a8cbe6911ef067c3d38a360897b390f6a855ff /test/web/admin_api/controllers/admin_api_controller_test.exs | |
| parent | df1eb5cf7ee6d718a28fca3d3715f11ab0e263cb (diff) | |
| parent | a5e1c400e49e7979e70f2c9dd4887ae144dca44c (diff) | |
| download | pleroma-436d1a3c41fc92183efffb81cc041ca270025d02.tar.gz pleroma-436d1a3c41fc92183efffb81cc041ca270025d02.zip | |
Merge branch 'develop' into 'issue/2115'
# Conflicts:
# CHANGELOG.md
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 |