aboutsummaryrefslogtreecommitdiff
path: root/test/web/admin_api/controllers/admin_api_controller_test.exs
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-09-21 15:05:46 -0500
committerAlex Gleason <alex@alexgleason.me>2020-09-21 15:26:10 -0500
commit0b728ccc4411677f1117f8e01d6f49aa4476c7ff (patch)
treec3aa86a88e5e4dddafe879299b604895c9df4e43 /test/web/admin_api/controllers/admin_api_controller_test.exs
parent23d5d7cf593550669812527ab12501b2a2adc6eb (diff)
downloadpleroma-0b728ccc4411677f1117f8e01d6f49aa4476c7ff.tar.gz
Pass hackney tls config into email tests, #2101
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.exs7
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 dbf478edf..f1e9b8938 100644
--- a/test/web/admin_api/controllers/admin_api_controller_test.exs
+++ b/test/web/admin_api/controllers/admin_api_controller_test.exs
@@ -1927,7 +1927,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