From 49e7bc00684592eae08c4ef5ef5c5f721a40b77f Mon Sep 17 00:00:00 2001 From: Luis Date: Tue, 18 Jul 2023 13:55:56 -0500 Subject: [PATCH 1/2] LG-10214 Fix Suspended User Create Account Email send changelog: User-Facing Improvements, Suspension, Add email send on create account --- app/forms/register_user_email_form.rb | 8 ++++---- spec/forms/register_user_email_form_spec.rb | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/forms/register_user_email_form.rb b/app/forms/register_user_email_form.rb index 90bcf22a767..7fe426573be 100644 --- a/app/forms/register_user_email_form.rb +++ b/app/forms/register_user_email_form.rb @@ -84,7 +84,7 @@ def process_successful_submission(request_id, instructions) # To prevent discovery of existing emails, we check to see if the email is # already taken and if so, we act as if the user registration was successful. if email_address_record&.user&.suspended? - send_suspended_user_email + send_suspended_user_email(email_address_record) elsif email_taken? && user_unconfirmed? update_user_language_preference send_sign_up_unconfirmed_email(request_id) @@ -151,10 +151,10 @@ def send_sign_up_confirmed_email end end - def send_suspended_user_email + def send_suspended_user_email(suspsended_email_record) UserMailer.with( - user: user, - email_address: email_address, + user: suspsended_email_record.user, + email_address: suspsended_email_record, ).suspended_create_account.deliver_now_or_later end diff --git a/spec/forms/register_user_email_form_spec.rb b/spec/forms/register_user_email_form_spec.rb index f10f319fdfc..ddbbdca081c 100644 --- a/spec/forms/register_user_email_form_spec.rb +++ b/spec/forms/register_user_email_form_spec.rb @@ -37,6 +37,7 @@ to: [registered_email_address], subject: t('user_mailer.suspended_create_account.subject'), ) + expect(subject.send(:email_address_record).user).to eq(user) end it 'sends the correct email to a taken email on an unconfirmed user' do user = create(*unconfirmed_user_registered_email) @@ -49,6 +50,7 @@ to: [registered_email_address], subject: t('user_mailer.suspended_create_account.subject'), ) + expect(subject.send(:email_address_record).user).to eq(user) end it 'sends the correct email to and unconfimed email on a confirmed user' do old_user = create(:user) @@ -62,6 +64,7 @@ to: [email_address.email], subject: t('user_mailer.suspended_create_account.subject'), ) + expect(subject.send(:email_address_record).user).to eq(old_user) end end From 0d52e95c2f7a950d5a2edef7409a68c29e3f446d Mon Sep 17 00:00:00 2001 From: Luis Date: Tue, 18 Jul 2023 14:05:18 -0500 Subject: [PATCH 2/2] Fix typo --- app/forms/register_user_email_form.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/forms/register_user_email_form.rb b/app/forms/register_user_email_form.rb index 7fe426573be..17493594957 100644 --- a/app/forms/register_user_email_form.rb +++ b/app/forms/register_user_email_form.rb @@ -151,10 +151,10 @@ def send_sign_up_confirmed_email end end - def send_suspended_user_email(suspsended_email_record) + def send_suspended_user_email(suspended_email_record) UserMailer.with( - user: suspsended_email_record.user, - email_address: suspsended_email_record, + user: suspended_email_record.user, + email_address: suspended_email_record, ).suspended_create_account.deliver_now_or_later end