zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-10 06:34:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Require a domain to be discarded before cancelling force delete

Browse source 
#791
This commit is contained in:
Artur Beljajev 2018-04-22 16:14:17 +03:00
parent be8ce276c7
commit ed6f067a8d
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/concerns/domain/force_delete.rb
View file

@ -23,6 +23,8 @@ module Concerns::Domain::ForceDelete
end end
def cancel_force_delete def cancel_force_delete
raise 'Domain must be discarded before cancelling force delete procedure' unless discarded?
statuses.delete(DomainStatus::FORCE_DELETE) statuses.delete(DomainStatus::FORCE_DELETE)
statuses.delete(DomainStatus::SERVER_RENEW_PROHIBITED) statuses.delete(DomainStatus::SERVER_RENEW_PROHIBITED)
statuses.delete(DomainStatus::SERVER_TRANSFER_PROHIBITED) statuses.delete(DomainStatus::SERVER_TRANSFER_PROHIBITED)

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

@ -11,6 +11,7 @@ class DomainForceDeleteTest < ActiveSupport::TestCase
travel_to Time.zone.parse('2010-07-05 00:00') travel_to Time.zone.parse('2010-07-05 00:00')
@domain.schedule_force_delete @domain.schedule_force_delete
@domain.reload
assert @domain.force_delete_scheduled? assert @domain.force_delete_scheduled?
assert_equal Time.zone.parse('2010-08-04 03:00'), @domain.force_delete_at assert_equal Time.zone.parse('2010-08-04 03:00'), @domain.force_delete_at
@ -25,14 +26,25 @@ class DomainForceDeleteTest < ActiveSupport::TestCase
assert @domain.force_delete_scheduled? assert @domain.force_delete_scheduled?
end end
def test_cancel_force_delete def test_cancelling_force_delete_on_discarded_domain
@domain.discard
@domain.schedule_force_delete
@domain.cancel_force_delete @domain.cancel_force_delete
@domain.reload
assert_not @domain.force_delete_scheduled? assert_not @domain.force_delete_scheduled?
assert_nil @domain.force_delete_at assert_nil @domain.force_delete_at
end end
def test_cancelling_force_delete_requires_a_domain_to_be_discarded
@domain.schedule_force_delete
assert_raises StandardError do
@domain.cancel_force_delete
end
end
def test_cancelling_force_delete_bypasses_validation def test_cancelling_force_delete_bypasses_validation
@domain = domains(:invalid) @domain = domains(:invalid)
@domain.discard
@domain.schedule_force_delete @domain.schedule_force_delete
@domain.cancel_force_delete @domain.cancel_force_delete
assert_not @domain.force_delete_scheduled? assert_not @domain.force_delete_scheduled?