diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-09-23 13:56:50 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-09-23 13:56:50 +0300 |
| commit | 8f5589cf667d8dd24da07e58db94225d81a55a7b (patch) | |
| tree | 7598cf8c495f0d02b3a4704a79e8618bd9652fee /test/web/admin_api/controllers/admin_api_controller_test.exs | |
| parent | b0bd81ef7187ddf5b4e6cfbc1780fc60b65798c6 (diff) | |
| parent | a5e1c400e49e7979e70f2c9dd4887ae144dca44c (diff) | |
| download | pleroma-8f5589cf667d8dd24da07e58db94225d81a55a7b.tar.gz pleroma-8f5589cf667d8dd24da07e58db94225d81a55a7b.zip | |
Merge develop
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 |