zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-23 11:16:00 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2201 from internetee/optimize-validation-event-model

Browse source 
Optimize verify email
This commit is contained in:
Timo Võhmar 2021-11-19 13:08:28 +02:00 • committed by GitHub
commit 9bdcc9e6b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 177 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

32
test/models/domain/force_delete_test.rb
View file

@ -440,38 +440,6 @@ class ForceDeleteTest < ActionMailer::TestCase
assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_two
end
def test_lifts_force_delete_if_contact_fixed
travel_to Time.zone.parse('2010-07-05')
@domain.update(valid_to: Time.zone.parse('2012-08-05'))
assert_not @domain.force_delete_scheduled?
email = '`@internet.ee'
Truemail.configure.default_validation_type = :regex
contact = @domain.admin_contacts.first
contact.update_attribute(:email, email)
contact.verify_email
assert contact.email_verification_failed?
@domain.reload
assert @domain.force_delete_scheduled?
contact.update_attribute(:email, 'aaa@bbb.com')
contact.reload
contact.verify_email
assert contact.need_to_lift_force_delete?
refute contact.need_to_start_force_delete?
assert_not contact.email_verification_failed?
CheckForceDeleteLift.perform_now
@domain.reload
assert_not @domain.force_delete_scheduled?
assert_nil @domain.status_notes[DomainStatus::FORCE_DELETE]
end
def test_lifts_force_delete_after_bounce_changes
@domain.update(valid_to: Time.zone.parse('2012-08-05'))
assert_not @domain.force_delete_scheduled?

47
test/models/validation_event_test.rb
View file

@ -29,20 +29,7 @@ class ValidationEventTest < ActiveSupport::TestCase
assert contact.need_to_start_force_delete?
end
def test_if_fd_need_to_be_lifted_if_email_fixed
test_if_fd_need_to_be_set_if_invalid_email
email = 'email@internet.ee'
contact = @domain.admin_contacts.first
contact.update_attribute(:email, email)
contact.verify_email
contact.reload
assert contact.need_to_lift_force_delete?
assert contact.validation_events.last.success?
end
def test_fd_didnt_set_if_mx_interation_less_then_value
@domain.update(valid_to: Time.zone.parse('2012-08-05'))
@ -52,7 +39,7 @@ class ValidationEventTest < ActiveSupport::TestCase
email = 'email@somestrangedomain12345.ee'
contact = @domain.admin_contacts.first
contact.update_attribute(:email, email)
(ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD - 1).times do
(ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD - 4).times do
contact.verify_email(check_level: 'mx')
end
contact.reload
@ -80,19 +67,6 @@ class ValidationEventTest < ActiveSupport::TestCase
assert contact.need_to_start_force_delete?
end
def test_if_fd_need_to_be_lifted_if_mx_fixed
test_if_fd_need_to_be_set_if_invalid_mx
email = 'email@internet.ee'
contact = @domain.admin_contacts.first
contact.update_attribute(:email, email)
contact.verify_email(check_level: 'mx')
contact.reload
assert contact.need_to_lift_force_delete?
assert contact.validation_events.last.success?
end
def test_if_fd_need_to_be_set_if_invalid_smtp
@domain.update(valid_to: Time.zone.parse('2012-08-05'))
assert_not @domain.force_delete_scheduled?
@ -101,27 +75,12 @@ class ValidationEventTest < ActiveSupport::TestCase
email = 'email@somestrangedomain12345.ee'
contact = @domain.admin_contacts.first
contact.update_attribute(:email, email)
ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD.times do
contact.verify_email(check_level: 'smtp')
end
contact.verify_email(check_level: 'smtp')
contact.reload
refute contact.validation_events.limit(ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD)
.any?(&:success?)
assert contact.need_to_start_force_delete?
end
def test_if_fd_need_to_be_lifted_if_smtp_fixed
test_if_fd_need_to_be_set_if_invalid_smtp
email = 'valid@internet.ee'
contact = @domain.admin_contacts.first
contact.update_attribute(:email, email)
contact.verify_email(check_level: 'smtp')
contact.reload
assert contact.need_to_lift_force_delete?
assert contact.validation_events.last.success?
end
end