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

Fix domain statuses removal

Browse source 
Close #1543s
This commit is contained in:
Alex Sherman 2020-02-26 19:30:38 +05:00
parent ed27152bb1
commit b859cfc090
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/domain.rb
View file

@ -485,9 +485,9 @@ class Domain < ApplicationRecord
self.delete_date = nil self.delete_date = nil
when DomainStatus::SERVER_MANUAL_INZONE # removal causes server hold to set when DomainStatus::SERVER_MANUAL_INZONE # removal causes server hold to set
self.outzone_at = Time.zone.now if force_delete_scheduled? self.outzone_at = Time.zone.now if force_delete_scheduled?
when DomainStatus::DomainStatus::EXPIRED # removal causes server hold to set when DomainStatus::EXPIRED # removal causes server hold to set
self.outzone_at = self.expire_time + 15.day self.outzone_at = self.expire_time + 15.day
when DomainStatus::DomainStatus::SERVER_HOLD # removal causes server hold to set when DomainStatus::SERVER_HOLD # removal causes server hold to set
self.outzone_at = nil self.outzone_at = nil
end end
end end

11
test/system/admin_area/domains_test.rb
View file

@ -35,4 +35,15 @@ class AdminDomainsTestTest < ApplicationSystemTestCase
assert_text 'deleteCandidate status has been removed' assert_text 'deleteCandidate status has been removed'
assert_no_link 'Remove deleteCandidate status' assert_no_link 'Remove deleteCandidate status'
end end
def test_remove_domain_status
@domain.update!(statuses: [DomainStatus::SERVER_REGISTRANT_CHANGE_PROHIBITED])
visit edit_admin_domain_url(@domain)
click_link_or_button 'Delete'
click_link_or_button 'Save'
assert_text 'Domain updated!'
end
end end