diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index 83cb57b13..ad91ccfec 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -243,11 +243,11 @@ class NewDomainForceDeleteTest < ActiveSupport::TestCase assert_not_includes(@domain.statuses, asserted_status) end - def test_does_force_delete_does_not_affect_pending_update_check + def test_force_delete_does_not_affect_pending_update_check @domain.schedule_force_delete(type: :soft) @domain.reload - @domain.statuses << DomainStatus::PENDING_DELETE + @domain.statuses << DomainStatus::PENDING_UPDATE assert @domain.force_delete_scheduled? assert @domain.pending_update? diff --git a/test/models/domain_cron_test.rb b/test/models/domain_cron_test.rb index 5b3b0120e..3bf36b9e2 100644 --- a/test/models/domain_cron_test.rb +++ b/test/models/domain_cron_test.rb @@ -52,4 +52,26 @@ class DomainCronTest < ActiveSupport::TestCase assert_emails 0 end + + def test_cleans_expired_pendings_when_force_delete_active + Setting.expire_pending_confirmation = 0 + + # Set force delete + @domain.schedule_force_delete(type: :soft) + @domain.reload + + @domain.statuses << DomainStatus::PENDING_UPDATE + # Set domain registrant change that's expired + @domain.update!(registrant_verification_asked_at: Time.zone.now, + registrant_verification_token: 'test', + statuses: @domain.statuses) + + assert @domain.pending_update? + @domain.reload + + DomainCron.clean_expired_pendings + @domain.reload + + assert_not @domain.pending_update? + end end