Merge branch 'master' of github.com:domify/registry

This commit is contained in:
Priit Tark 2015-09-10 14:51:01 +03:00
commit bf13e40b5e
3 changed files with 33 additions and 14 deletions

View file

@ -142,7 +142,7 @@ class DomainStatus < ActiveRecord::Base
# ['ManualInzone', SERVER_MANUAL_INZONE], # ['ManualInzone', SERVER_MANUAL_INZONE],
# [''], # [''],
# ['RenewProhibited', SERVER_RENEW_PROHIBITED], # ['RenewProhibited', SERVER_RENEW_PROHIBITED],
# ['TransferProhibited', SERVER_TRANSFER_PROHIBITED], ['TransferProhibited', SERVER_TRANSFER_PROHIBITED],
# ['RegistrantChangeProhibited', SERVER_REGISTRANT_CHANGE_PROHIBITED], # ['RegistrantChangeProhibited', SERVER_REGISTRANT_CHANGE_PROHIBITED],
# ['AdminChangeProhibited', SERVER_ADMIN_CHANGE_PROHIBITED], # ['AdminChangeProhibited', SERVER_ADMIN_CHANGE_PROHIBITED],
# ['TechChangeProhibited', SERVER_TECH_CHANGE_PROHIBITED], # ['TechChangeProhibited', SERVER_TECH_CHANGE_PROHIBITED],

View file

@ -744,7 +744,9 @@ class Epp::Domain < Domain
DomainStatus::PENDING_DELETE, DomainStatus::PENDING_DELETE,
DomainStatus::PENDING_RENEW, DomainStatus::PENDING_RENEW,
DomainStatus::PENDING_TRANSFER, DomainStatus::PENDING_TRANSFER,
DomainStatus::FORCE_DELETE DomainStatus::FORCE_DELETE,
DomainStatus::SERVER_TRANSFER_PROHIBITED,
DomainStatus::CLIENT_TRANSFER_PROHIBITED
]).empty? ]).empty?
end end

View file

@ -1805,6 +1805,23 @@ describe 'EPP Domain', epp: true do
end end
end end
it 'should not transfer when in prohibited status' do
domain.statuses = [DomainStatus::SERVER_TRANSFER_PROHIBITED]
domain.save
pw = domain.auth_info
xml = domain_transfer_xml({
name: { value: domain.name },
authInfo: { pw: { value: pw } }
})
login_as :registrar2 do
response = epp_plain_request(xml)
response[:msg].should == 'Object status prohibits operation'
response[:result_code].should == '2304'
end
end
### UPDATE ### ### UPDATE ###
it 'should update right away without update pending status' do it 'should update right away without update pending status' do
existing_pw = domain.auth_info existing_pw = domain.auth_info