Update form spec expectations

app/forms/webauthn_visit_form.rb

@@ -41,10 +41,9 @@ def check_params(params)
     return unless error
 
     if @platform_authenticator
-      errors.add error, translate_platform_authenticator_error(error),
-                 type: :"#{translate_platform_authenticator_error(error).split('.').last}"
+      errors.add error, :invalid, message: translate_platform_authenticator_error(error)
     else
-      errors.add error, translate_error(error), type: :"#{translate_error(error).split('.').last}"
+      errors.add error, :invalid, message: translate_error(error)
     end
   end
 

spec/forms/openid_connect_authorize_form_spec.rb

@@ -66,7 +66,7 @@
         it 'is unsuccessful and has error messages' do
           expect(result.to_h).to eq(
             success: false,
-            errors: { response_type: ['is not included in the list'] },
+            errors: nil,
             error_details: { response_type: { inclusion: true } },
             client_id: client_id,
             prompt: 'select_account',

spec/forms/openid_connect_token_form_spec.rb

@@ -395,7 +395,7 @@
 
         expect(submission.to_h).to include(
           success: false,
-          errors: form.errors.messages,
+          errors: nil,
           error_details: hash_including(*form.errors.attribute_names),
           client_id: nil,
           user_id: nil,
@@ -412,7 +412,7 @@
 
         expect(submission.to_h).to include(
           success: false,
-          errors: form.errors.messages,
+          errors: nil,
           error_details: hash_including(:grant_type),
           client_id: client_id,
           user_id: user.uuid,

spec/forms/otp_delivery_selection_form_spec.rb

@@ -41,11 +41,6 @@
 
     context 'when the form is invalid' do
       it 'returns false for success? and includes errors' do
-        errors = {
-          otp_delivery_preference: ['is not included in the list'],
-          phone: ['Please fill in this field.'],
-        }
-
         extra = {
           otp_delivery_preference: 'foo',
           resend: false,
@@ -62,8 +57,11 @@
 
         expect(subject.submit(otp_delivery_preference: 'foo').to_h).to include(
           success: false,
-          errors: errors,
-          error_details: hash_including(*errors.keys),
+          errors: nil,
+          error_details: {
+            otp_delivery_preference: { inclusion: true },
+            phone: { blank: true },
+          },
           **extra,
         )
       end

spec/forms/password_reset_email_form_spec.rb

@@ -39,12 +39,10 @@
       it 'returns hash with properties about the event and the nonexistent user' do
         subject = PasswordResetEmailForm.new('invalid')
 
-        errors = { email: [t('valid_email.validations.email.invalid')] }
-
         expect(subject.submit.to_h).to include(
           success: false,
-          errors: errors,
-          error_details: hash_including(*errors.keys),
+          errors: nil,
+          error_details: { email: { invalid: true } },
           user_id: 'nonexistent-uuid',
           confirmed: false,
           active_profile: false,
@@ -53,12 +51,11 @@
 
       it 'returns false and adds errors to the form object when domain is invalid' do
         subject = PasswordResetEmailForm.new('test@çà.com')
-        errors = { email: [t('valid_email.validations.email.invalid')] }
 
         expect(subject.submit.to_h).to include(
           success: false,
-          errors: errors,
-          error_details: hash_including(*errors.keys),
+          errors: nil,
+          error_details: { email: { domain: true } },
           user_id: 'nonexistent-uuid',
           confirmed: false,
           active_profile: false,

spec/forms/personal_key_form_spec.rb

@@ -21,14 +21,13 @@
     context 'when the form is invalid' do
       it 'returns FormResponse with success: false' do
         user = create(:user, :fully_registered, personal_key: 'code')
-        errors = { personal_key: ['Incorrect personal key'] }
 
         form = PersonalKeyForm.new(user, 'foo')
 
         expect(form.submit.to_h).to include(
           success: false,
-          errors: errors,
-          error_details: hash_including(*errors.keys),
+          errors: nil,
+          error_details: { personal_key: { personal_key_incorrect: true } },
         )
         expect(user.encrypted_recovery_code_digest).to_not be_nil
         expect(form.personal_key).to be_nil

spec/forms/register_user_email_form_spec.rb

@@ -280,7 +280,6 @@
     context 'when email is invalid' do
       it 'returns false and adds errors to the form object' do
         invalid_email = 'invalid_email'
-        errors = { email: [t('valid_email.validations.email.invalid')] }
 
         extra = {
           email_already_exists: false,
@@ -291,16 +290,14 @@
 
         expect(subject.submit(email: invalid_email, terms_accepted: '1').to_h).to include(
           success: false,
-          errors: errors,
-          error_details: hash_including(*errors.keys),
+          errors: nil,
+          error_details: { email: { invalid: true } },
           **extra,
         )
         expect_delivered_email_count(0)
       end
 
       it 'returns false and adds errors to the form object when domain is invalid' do
-        errors = { email: [t('valid_email.validations.email.invalid')] }
-
         extra = {
           email_already_exists: false,
           rate_limited: false,
@@ -310,8 +307,8 @@
 
         expect(subject.submit(email: 'test@çà.com', terms_accepted: '1').to_h).to include(
           success: false,
-          errors: errors,
-          error_details: hash_including(*errors.keys),
+          errors: nil,
+          error_details: { email: { domain: true } },
           **extra,
         )
         expect_delivered_email_count(0)
@@ -321,7 +318,6 @@
         blocked_domain = 'blocked.com'
         blocked_email = 'test@' + blocked_domain
         email_address = create(:email_address, email: blocked_email)
-        errors = { email: [t('valid_email.validations.email.invalid')] }
         allow(BanDisposableEmailValidator).to receive(:config).and_return([blocked_domain])
 
         extra = {
@@ -333,8 +329,8 @@
 
         expect(subject.submit(email: blocked_email, terms_accepted: '1').to_h).to include(
           success: false,
-          errors: errors,
-          error_details: hash_including(*errors.keys),
+          errors: nil,
+          error_details: { email: { t('valid_email.validations.email.invalid') => true } },
           **extra,
         )
         expect_delivered_email_count(0)
@@ -344,13 +340,12 @@
         blocked_domain = 'blocked.com'
         blocked_email = 'test@sub.' + blocked_domain
 
-        errors = { email: [t('valid_email.validations.email.invalid')] }
         expect(BanDisposableEmailValidator).to receive(:config).and_return([blocked_domain])
 
         expect(subject.submit(email: blocked_email, terms_accepted: '1').to_h).to include(
           success: false,
-          errors: errors,
-          error_details: hash_including(*errors.keys),
+          errors: nil,
+          error_details: { email: { t('valid_email.validations.email.invalid') => true } },
           email_already_exists: false,
           rate_limited: false,
           user_id: 'anonymous-uuid',
@@ -389,7 +384,7 @@
 
         expect(result.to_h).to eq(
           success: false,
-          errors: { terms_accepted: [t('errors.registration.terms')] },
+          errors: nil,
           error_details: { terms_accepted: { terms: true } },
           email_already_exists: false,
           rate_limited: false,

spec/forms/reset_password_form_spec.rb

@@ -26,7 +26,7 @@
       it 'returns a hash with errors' do
         expect(result.to_h).to eq(
           success: false,
-          errors: { reset_password_token: ['token_expired'] },
+          errors: nil,
           error_details: { reset_password_token: { token_expired: true } },
           user_id: '123',
           profile_deactivated: false,
@@ -46,14 +46,7 @@
       it 'returns a hash with errors' do
         expect(result.to_h).to eq(
           success: false,
-          errors: {
-            password:
-              ["Password must be at least #{Devise.password_length.first} characters long"],
-            password_confirmation: [I18n.t(
-              'errors.messages.too_short',
-              count: Devise.password_length.first,
-            )],
-          },
+          errors: nil,
           error_details: {
             password: { too_short: true },
             password_confirmation: { too_short: true },
@@ -95,15 +88,7 @@
       it 'returns a hash with errors' do
         expect(result.to_h).to eq(
           success: false,
-          errors: {
-            password: [
-              t('errors.attributes.password.too_short.other', count: Devise.password_length.first),
-            ],
-            password_confirmation: [
-              t('errors.messages.too_short', count: Devise.password_length.first),
-            ],
-            reset_password_token: ['token_expired'],
-          },
+          errors: nil,
           error_details: {
             password: { too_short: true },
             password_confirmation: { too_short: true },
@@ -123,7 +108,7 @@
       it 'returns a hash with errors' do
         expect(result.to_h).to eq(
           success: false,
-          errors: { reset_password_token: ['invalid_token'] },
+          errors: nil,
           error_details: { reset_password_token: { invalid_token: true } },
           user_id: nil,
           profile_deactivated: false,

spec/forms/totp_setup_form_spec.rb

@@ -80,8 +80,8 @@
 
         expect(form.submit.to_h).to include(
           success: false,
+          errors: nil,
           error_details: { name: { blank: true } },
-          errors: { name: [t('errors.messages.blank')] },
         )
         expect(user.auth_app_configurations.any?).to eq false
       end
@@ -95,8 +95,8 @@
 
         expect(form2.submit.to_h).to include(
           success: false,
+          errors: nil,
           error_details: { name: { unique_name: true } },
-          errors: { name: [t('errors.piv_cac_setup.unique_name')] },
         )
       end
     end

spec/forms/two_factor_login_options_form_spec.rb

@@ -27,10 +27,6 @@
 
     context 'when the form is invalid' do
       it 'returns false for success? and includes errors' do
-        errors = {
-          selection: ['is not included in the list'],
-        }
-
         extra = {
           selection: 'foo',
           enabled_mfa_methods_count: 1,
@@ -40,8 +36,8 @@
 
         expect(subject.submit(selection: 'foo').to_h).to include(
           success: false,
-          errors: errors,
-          error_details: hash_including(*errors.keys),
+          errors: nil,
+          error_details: { selection: { inclusion: true } },
           **extra,
         )
       end

spec/forms/update_user_password_form_spec.rb

@@ -22,17 +22,6 @@
       let(:password) { 'invalid' }
 
       it 'returns FormResponse with success: false and does not do anything else' do
-        errors = {
-          password: [t(
-            'errors.attributes.password.too_short.other',
-            count: Devise.password_length.first,
-          )],
-          password_confirmation: [I18n.t(
-            'errors.messages.too_short',
-            count: Devise.password_length.first,
-          )],
-        }
-
         expect(UserProfilesEncryptor).not_to receive(:new)
         user.save!
 
@@ -43,7 +32,7 @@
 
         expect(result).to include(
           success: false,
-          errors: errors,
+          errors: nil,
           error_details: hash_including(:password, :password_confirmation),
         )
       end

spec/forms/webauthn_setup_form_spec.rb

@@ -192,14 +192,7 @@
 
         expect(subject.submit(params).to_h).to eq(
           success: false,
-          errors: {
-            attestation_object: [
-              I18n.t(
-                'errors.webauthn_setup.general_error_html',
-                link_html: I18n.t('errors.webauthn_setup.additional_methods_link'),
-              ),
-            ],
-          },
+          errors: nil,
           error_details: { attestation_object: { invalid: true } },
           **extra_attributes,
         )
@@ -244,14 +237,7 @@
 
         expect(subject.submit(params).to_h).to eq(
           success: false,
-          errors: {
-            attestation_object: [
-              I18n.t(
-                'errors.webauthn_setup.general_error_html',
-                link_html: I18n.t('errors.webauthn_setup.additional_methods_link'),
-              ),
-            ],
-          },
+          errors: nil,
           error_details: { attestation_object: { invalid: true } },
           **extra_attributes,
         )