Allow domain renew indefinitely #2610

This commit is contained in:
Martin Lensment 2015-06-09 16:03:09 +03:00
parent 412f154359
commit 81169e9fbc
2 changed files with 23 additions and 2 deletions

View file

@ -430,8 +430,10 @@ class Epp::Domain < Domain
# TODO: Check how much time before domain exp date can it be renewed # TODO: Check how much time before domain exp date can it be renewed
validate_exp_dates(cur_exp_date) validate_exp_dates(cur_exp_date)
if (valid_to - Time.zone.now).to_i / 1.day >= Setting.days_to_renew_domain_before_expire if Setting.days_to_renew_domain_before_expire != 0
add_epp_error('2105', nil, nil, I18n.t('object_is_not_eligible_for_renewal')) if (valid_to - Time.zone.now).to_i / 1.day >= Setting.days_to_renew_domain_before_expire
add_epp_error('2105', nil, nil, I18n.t('object_is_not_eligible_for_renewal'))
end
end end
return false if errors.any? return false if errors.any?

View file

@ -2028,6 +2028,25 @@ describe 'EPP Domain', epp: true do
response[:results][0][:result_code].should == '1000' response[:results][0][:result_code].should == '1000'
end end
it 'does not renew a domain unless less than 90 days till expiration' do
Setting.days_to_renew_domain_before_expire = 0
domain.valid_to = Time.zone.now.to_date + 5.years
domain.save
exp_date = domain.valid_to.to_date
xml = @epp_xml.domain.renew(
name: { value: domain.name },
curExpDate: { value: exp_date.to_s },
period: { value: '1', attrs: { unit: 'y' } }
)
response = epp_plain_request(xml)
response[:results][0][:msg].should == 'Command completed successfully'
response[:results][0][:result_code].should == '1000'
Setting.days_to_renew_domain_before_expire = 90
end
it 'does not renew foreign domain' do it 'does not renew foreign domain' do
login_as :registrar2 do login_as :registrar2 do
exp_date = 1.year.since.to_date exp_date = 1.year.since.to_date