diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-09-25 10:48:01 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-09-25 10:48:01 -0500 |
| commit | 2bf2c68dee1385cba906fe95bd2af3afd2a341b9 (patch) | |
| tree | d9c1fed6298705d59c5108d52e452922fbdd699b /test/web/admin_api/controllers | |
| parent | 88653c01c92fffb396e32edad203d18607980c04 (diff) | |
| parent | 5cd71208d9b273535f978559011377e703e82dcb (diff) | |
| download | pleroma-2bf2c68dee1385cba906fe95bd2af3afd2a341b9.tar.gz pleroma-2bf2c68dee1385cba906fe95bd2af3afd2a341b9.zip | |
Merge branch 'develop' into fix/deprecation-warning-welcome-message
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 |