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

More test fixes #2623

Browse source
This commit is contained in:
Martin Lensment 2015-06-15 16:54:01 +03:00
parent 6229d6cb35
commit 6ad458e20f
3 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/models/domain.rb
View file

@ -244,12 +244,6 @@ class Domain < ActiveRecord::Base
domain_transfers.find_by(status: DomainTransfer::PENDING) domain_transfers.find_by(status: DomainTransfer::PENDING)
end end
def can_be_deleted?
(domain_statuses.pluck(:value) & %W(
#{DomainStatus::SERVER_DELETE_PROHIBITED}
)).empty?
end
def expirable? def expirable?
return false if valid_to > Time.zone.now return false if valid_to > Time.zone.now
!statuses.include?(DomainStatus::EXPIRED) !statuses.include?(DomainStatus::EXPIRED)
@ -338,9 +332,7 @@ class Domain < ActiveRecord::Base
end end
def pending_delete? def pending_delete?
(domain_statuses.pluck(:value) & %W( statuses.include?(DomainStatus::PENDING_DELETE)
#{DomainStatus::PENDING_DELETE}
)).present?
end end
def pending_delete! def pending_delete!
@ -348,7 +340,9 @@ class Domain < ActiveRecord::Base
self.epp_pending_delete = true # for epp self.epp_pending_delete = true # for epp
return true unless registrant_verification_asked? return true unless registrant_verification_asked?
domain_statuses.create(value: DomainStatus::PENDING_DELETE) statuses << DomainStatus::PENDING_DELETE
save(validate: false) # should check if this did succeed
DomainMailer.pending_deleted(self).deliver_now DomainMailer.pending_deleted(self).deliver_now
end end

4
app/models/epp/domain.rb
View file

@ -659,9 +659,7 @@ class Epp::Domain < Domain
begin begin
errors.add(:base, :domain_status_prohibits_operation) errors.add(:base, :domain_status_prohibits_operation)
return false return false
end if (domain_statuses.pluck(:value) & %W( end if statuses.include?(DomainStatus::CLIENT_DELETE_PROHIBITED)
#{DomainStatus::CLIENT_DELETE_PROHIBITED}
)).any?
true true
end end

19
spec/epp/domain_spec.rb
View file

@ -1839,10 +1839,11 @@ describe 'EPP Domain', epp: true do
response[:results][0][:msg].should == 'Command completed successfully' response[:results][0][:msg].should == 'Command completed successfully'
response[:results][0][:result_code].should == '1000' response[:results][0][:result_code].should == '1000'
d.reload
d.dnskeys.count.should == 1 d.dnskeys.count.should == 1
d.domain_statuses.count.should == 1 d.statuses.count.should == 1
d.domain_statuses.first.value.should == 'clientUpdateProhibited' d.statuses.first.should == 'clientUpdateProhibited'
rem_ns = d.nameservers.find_by(hostname: 'ns1.example.com') rem_ns = d.nameservers.find_by(hostname: 'ns1.example.com')
rem_ns.should be_falsey rem_ns.should be_falsey
@ -1861,8 +1862,12 @@ describe 'EPP Domain', epp: true do
response[:results][1][:value].should == 'FIXED:CITIZEN_1234' response[:results][1][:value].should == 'FIXED:CITIZEN_1234'
response[:results][2][:result_code].should == '2303' response[:results][2][:result_code].should == '2303'
response[:results][2][:msg].should == 'Status was not found' response[:results][2][:msg].should == 'DS was not found'
response[:results][2][:value].should == 'clientHold' response[:results][2][:value].should == '700b97b591ed27ec2590d19f06f88bba700b97b591ed27ec2590d19f'
response[:results][3][:result_code].should == '2303'
response[:results][3][:msg].should == 'Status was not found'
response[:results][3][:value].should == 'clientHold'
end end
it 'does not remove server statuses' do it 'does not remove server statuses' do
@ -2318,7 +2323,8 @@ describe 'EPP Domain', epp: true do
end end
it 'does not delete domain with specific status' do it 'does not delete domain with specific status' do
domain.domain_statuses.create(value: DomainStatus::CLIENT_DELETE_PROHIBITED) domain.statuses << DomainStatus::CLIENT_DELETE_PROHIBITED
domain.save
response = epp_plain_request(@epp_xml.domain.delete({ response = epp_plain_request(@epp_xml.domain.delete({
name: { value: domain.name } name: { value: domain.name }
@ -2336,7 +2342,8 @@ describe 'EPP Domain', epp: true do
end end
it 'does not delete domain with pending delete' do it 'does not delete domain with pending delete' do
domain.domain_statuses.create(value: DomainStatus::PENDING_DELETE) domain.statuses << DomainStatus::PENDING_DELETE
domain.save
response = epp_plain_request(@epp_xml.domain.delete({ response = epp_plain_request(@epp_xml.domain.delete({
name: { value: domain.name } name: { value: domain.name }