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

Extract method

Browse source
This commit is contained in:
Artur Beljajev 2018-06-11 08:26:17 +03:00
parent 4e2bd9f2da
commit c2d5b7c704
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ module Concerns::Domain::ForceDelete
self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).utc self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).utc
.beginning_of_day .beginning_of_day
stop_all_pending_actions stop_all_pending_actions
allow_deletion
save(validate: false) save(validate: false)
end end
@ -26,8 +27,6 @@ module Concerns::Domain::ForceDelete
private private
def stop_all_pending_actions def stop_all_pending_actions
statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED)
statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED)
statuses.delete(DomainStatus::PENDING_UPDATE) statuses.delete(DomainStatus::PENDING_UPDATE)
statuses.delete(DomainStatus::PENDING_TRANSFER) statuses.delete(DomainStatus::PENDING_TRANSFER)
statuses.delete(DomainStatus::PENDING_RENEW) statuses.delete(DomainStatus::PENDING_RENEW)
@ -63,4 +62,9 @@ module Concerns::Domain::ForceDelete
statuses.delete(DomainStatus::PENDING_DELETE) statuses.delete(DomainStatus::PENDING_DELETE)
statuses.delete(DomainStatus::SERVER_MANUAL_INZONE) statuses.delete(DomainStatus::SERVER_MANUAL_INZONE)
end end
def allow_deletion
statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED)
statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED)
end
end end

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

@ -34,10 +34,20 @@ class DomainForceDeleteTest < ActiveSupport::TestCase
assert (@domain.statuses & statuses_to_be_added) == statuses_to_be_added assert (@domain.statuses & statuses_to_be_added) == statuses_to_be_added
end end
def test_scheduling_force_delete_stops_pending_actions def test_scheduling_force_delete_allows_domain_deletion
statuses_to_be_removed = [ statuses_to_be_removed = [
DomainStatus::CLIENT_DELETE_PROHIBITED, DomainStatus::CLIENT_DELETE_PROHIBITED,
DomainStatus::SERVER_DELETE_PROHIBITED, DomainStatus::SERVER_DELETE_PROHIBITED,
]
@domain.statuses = statuses_to_be_removed + %w[other-status]
@domain.schedule_force_delete
@domain.reload
assert_empty @domain.statuses & statuses_to_be_removed
end
def test_scheduling_force_delete_stops_pending_actions
statuses_to_be_removed = [
DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_UPDATE,
DomainStatus::PENDING_TRANSFER, DomainStatus::PENDING_TRANSFER,
DomainStatus::PENDING_RENEW, DomainStatus::PENDING_RENEW,