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

Remove more statuses when applying forceDelete #2846

Browse source
This commit is contained in:
Martin Lensment 2015-08-10 11:27:20 +03:00
parent 1d51d5fdab
commit 147948548f
2 changed files with 42 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/domain.rb
View file

@ -539,6 +539,10 @@ class Domain < ActiveRecord::Base
statuses << DomainStatus::PENDING_DELETE statuses << DomainStatus::PENDING_DELETE
statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED) statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED)
statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED) statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED)
statuses.delete(DomainStatus::PENDING_UPDATE)
statuses.delete(DomainStatus::PENDING_TRANSFER)
statuses.delete(DomainStatus::PENDING_RENEW)
statuses.delete(DomainStatus::PENDING_CREATE)
self.force_delete_at = Time.zone.now + Setting.redemption_grace_period.days unless force_delete_at self.force_delete_at = Time.zone.now + Setting.redemption_grace_period.days unless force_delete_at
save(validate: false) save(validate: false)

40
spec/models/domain_spec.rb
View file

@ -212,14 +212,50 @@ describe Domain do
@domain.statuses = ['ok'] @domain.statuses = ['ok']
@domain.set_force_delete @domain.set_force_delete
@domain.statuses.count.should == 6 @domain.statuses.should match_array([
"forceDelete",
"pendingDelete",
"serverManualInzone",
"serverRenewProhibited",
"serverTransferProhibited",
"serverUpdateProhibited"
])
fda = Time.zone.now + Setting.redemption_grace_period.days fda = Time.zone.now + Setting.redemption_grace_period.days
@domain.force_delete_at.should be_within(20).of(fda) @domain.force_delete_at.should be_within(20).of(fda)
@domain.unset_force_delete @domain.unset_force_delete
@domain.statuses.count.should == 1 @domain.statuses.should == ['ok']
@domain.force_delete_at.should be_nil @domain.force_delete_at.should be_nil
@domain.statuses = [
DomainStatus::CLIENT_DELETE_PROHIBITED,
DomainStatus::SERVER_DELETE_PROHIBITED,
DomainStatus::PENDING_UPDATE,
DomainStatus::PENDING_TRANSFER,
DomainStatus::PENDING_RENEW,
DomainStatus::PENDING_CREATE,
DomainStatus::CLIENT_HOLD
]
@domain.save
@domain.set_force_delete
@domain.statuses.should match_array([
"forceDelete",
"pendingDelete",
"serverManualInzone",
"serverRenewProhibited",
"serverTransferProhibited",
"serverUpdateProhibited",
"clientHold"
])
@domain.unset_force_delete
@domain.statuses.should == ['clientHold']
end end
it 'should set expired status and update outzone_at and delete_at' do it 'should set expired status and update outzone_at and delete_at' do