move validator from callback to action interactor and to the api controller

This commit is contained in:
Oleg Hasjanov 2024-01-16 13:00:10 +02:00 committed by Oleg Hasjanov
parent f4d276fc44
commit 8eee65579b
9 changed files with 127 additions and 116 deletions

View file

@ -404,37 +404,37 @@ class ForceDeleteTest < ActionMailer::TestCase
assert notification.text.include? asserted_text
end
# def test_add_invalid_email_to_domain_status_notes
# domain = domains(:airport)
# domain.update(valid_to: Time.zone.parse('2012-08-05'),
# statuses: %w[serverForceDelete serverRenewProhibited serverTransferProhibited],
# force_delete_data: { 'template_name': 'invalid_email', 'force_delete_type': 'soft' },
# status_notes: { "serverForceDelete": '`@internet2.ee' })
def test_add_invalid_email_to_domain_status_notes
domain = domains(:airport)
domain.update(valid_to: Time.zone.parse('2012-08-05'),
statuses: %w[serverForceDelete serverRenewProhibited serverTransferProhibited],
force_delete_data: { 'template_name': 'invalid_email', 'force_delete_type': 'soft' },
status_notes: { "serverForceDelete": '`@internet2.ee' })
# travel_to Time.zone.parse('2010-07-05')
# email = '`@internet.ee'
# invalid_emails = '`@internet2.ee `@internet.ee'
# asserted_text = "Invalid email: #{invalid_emails}"
travel_to Time.zone.parse('2010-07-05')
email = '`@internet.ee'
invalid_emails = '`@internet2.ee `@internet.ee'
asserted_text = "Invalid email: #{invalid_emails}"
# Truemail.configure.default_validation_type = :regex
Truemail.configure.default_validation_type = :regex
# contact_first = domain.admin_contacts.first
contact_first = domain.admin_contacts.first
# contact_first.update_attribute(:email_history, 'john@inbox.test')
# contact_first.update_attribute(:email, email)
contact_first.update_attribute(:email_history, 'john@inbox.test')
contact_first.update_attribute(:email, email)
# ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD.times do
# contact_first.verify_email
# end
ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD.times do
contact_first.verify_email
end
# perform_check_force_delete_job(contact_first.id)
# domain.reload
perform_check_force_delete_job(contact_first.id)
domain.reload
# assert_equal domain.status_notes[DomainStatus::FORCE_DELETE], invalid_emails
# notification = domain.registrar.notifications.last
# assert_not notification.text.include? asserted_text
# end
assert_equal domain.status_notes[DomainStatus::FORCE_DELETE], invalid_emails
notification = domain.registrar.notifications.last
assert_not notification.text.include? asserted_text
end
def test_remove_invalid_email_from_domain_status_notes
domain = domains(:airport)
@ -464,35 +464,35 @@ class ForceDeleteTest < ActionMailer::TestCase
assert_not domain.force_delete_scheduled?
end
# def test_domain_should_have_several_bounced_emails
# @domain.update(valid_to: Time.zone.parse('2012-08-05'))
# assert_not @domain.force_delete_scheduled?
# travel_to Time.zone.parse('2010-07-05')
# email_one = '`@internet.ee'
# email_two = '@@internet.ee'
def test_domain_should_have_several_bounced_emails
@domain.update(valid_to: Time.zone.parse('2012-08-05'))
assert_not @domain.force_delete_scheduled?
travel_to Time.zone.parse('2010-07-05')
email_one = '`@internet.ee'
email_two = '@@internet.ee'
# contact_one = @domain.admin_contacts.first
# contact_one.update_attribute(:email, email_one)
# contact_one.verify_email
# perform_check_force_delete_job(contact_one.id)
contact_one = @domain.admin_contacts.first
contact_one.update_attribute(:email, email_one)
contact_one.verify_email
perform_check_force_delete_job(contact_one.id)
# assert contact_one.need_to_start_force_delete?
assert contact_one.need_to_start_force_delete?
# contact_two = @domain.admin_contacts.first
# contact_two.update_attribute(:email, email_two)
# contact_two.verify_email
# perform_check_force_delete_job(contact_two.id)
contact_two = @domain.admin_contacts.first
contact_two.update_attribute(:email, email_two)
contact_two.verify_email
perform_check_force_delete_job(contact_two.id)
# assert contact_two.need_to_start_force_delete?
assert contact_two.need_to_start_force_delete?
# @domain.reload
@domain.reload
# assert @domain.force_delete_scheduled?
# assert_equal Date.parse('2010-09-19'), @domain.force_delete_date.to_date
# assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date
# assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_one
# assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_two
# end
assert @domain.force_delete_scheduled?
assert_equal Date.parse('2010-09-19'), @domain.force_delete_date.to_date
assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date
assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_one
assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_two
end
def test_lifts_force_delete_after_bounce_changes
@domain.update(valid_to: Time.zone.parse('2012-08-05'))