diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-09-21 15:05:46 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-09-21 15:26:10 -0500 |
| commit | 0b728ccc4411677f1117f8e01d6f49aa4476c7ff (patch) | |
| tree | c3aa86a88e5e4dddafe879299b604895c9df4e43 | |
| parent | 23d5d7cf593550669812527ab12501b2a2adc6eb (diff) | |
| download | pleroma-0b728ccc4411677f1117f8e01d6f49aa4476c7ff.tar.gz | |
Pass hackney tls config into email tests, #2101
| -rw-r--r-- | test/user_test.exs | 7 | ||||
| -rw-r--r-- | test/web/admin_api/controllers/admin_api_controller_test.exs | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/test/user_test.exs b/test/user_test.exs index 301d8f05e..9cabb501c 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -509,7 +509,12 @@ defmodule Pleroma.UserTest do cng = User.register_changeset(%User{}, @full_user_data) {:ok, registered_user} = User.register(cng) ObanHelpers.perform_all() - assert_email_sent(Pleroma.Emails.UserEmail.account_confirmation_email(registered_user)) + + Pleroma.Emails.UserEmail.account_confirmation_email(registered_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 test "it requires an email, name, nickname and password, bio is optional when account_activation_required is enabled" do 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 |