mirror of
https://github.com/internetee/registry.git
synced 2025-07-23 19:20:37 +02:00
Extract method
This commit is contained in:
parent
4e2bd9f2da
commit
c2d5b7c704
2 changed files with 17 additions and 3 deletions
|
@ -11,6 +11,7 @@ module Concerns::Domain::ForceDelete
|
|||
self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).utc
|
||||
.beginning_of_day
|
||||
stop_all_pending_actions
|
||||
allow_deletion
|
||||
save(validate: false)
|
||||
end
|
||||
|
||||
|
@ -26,8 +27,6 @@ module Concerns::Domain::ForceDelete
|
|||
private
|
||||
|
||||
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_TRANSFER)
|
||||
statuses.delete(DomainStatus::PENDING_RENEW)
|
||||
|
@ -63,4 +62,9 @@ module Concerns::Domain::ForceDelete
|
|||
statuses.delete(DomainStatus::PENDING_DELETE)
|
||||
statuses.delete(DomainStatus::SERVER_MANUAL_INZONE)
|
||||
end
|
||||
|
||||
def allow_deletion
|
||||
statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED)
|
||||
statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -34,10 +34,20 @@ class DomainForceDeleteTest < ActiveSupport::TestCase
|
|||
assert (@domain.statuses & statuses_to_be_added) == statuses_to_be_added
|
||||
end
|
||||
|
||||
def test_scheduling_force_delete_stops_pending_actions
|
||||
def test_scheduling_force_delete_allows_domain_deletion
|
||||
statuses_to_be_removed = [
|
||||
DomainStatus::CLIENT_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_TRANSFER,
|
||||
DomainStatus::PENDING_RENEW,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue