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

Do not put clientHold to zonefile #2023

Browse source
This commit is contained in:
Martin Lensment 2015-08-06 13:41:13 +03:00
parent 4ef71d4da0
commit 697c435743
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
spec/models/zonefile_setting_spec.rb
View file

@ -39,9 +39,9 @@ describe ZonefileSetting do
@zonefile.scan(/^#{d.name}/).count.should == 0
end
it 'should not place serverHold domains into zonefile' do
it 'should not place serverHold nor clientHold domains into zonefile' do
Fabricate(:zonefile_setting)
d = Fabricate(:domain_with_dnskeys, name: 'testzone.ee', statuses: ['serverHold', 'serverDeleteProhibited'])
d = Fabricate(:domain_with_dnskeys, name: 'testzone.ee', statuses: ['serverHold', 'serverDeleteProhibited', 'clientHold'])
d.nameservers << Nameserver.new({
hostname: "ns.#{d.name}",
ipv4: '123.123.123.123',
@ -58,7 +58,20 @@ describe ZonefileSetting do
@zonefile.scan('123.123.123.123').count.should == 0
@zonefile.scan('FE80:0000:0000:0000:0202:B3FF:FE1E:8329').count.should == 0
d.statuses = ['ok']
d.statuses = ['clientHold', 'serverDeleteProhibited']
d.save
@zonefile = ActiveRecord::Base.connection.execute(
"select generate_zonefile('ee')"
)[0]['generate_zonefile']
@zonefile.should_not be_blank
@zonefile.scan(/^#{d.name}/).count.should == 0
@zonefile.scan(/ns.#{d.name}/).count.should == 0
@zonefile.scan('123.123.123.123').count.should == 0
@zonefile.scan('FE80:0000:0000:0000:0202:B3FF:FE1E:8329').count.should == 0
d.statuses = ['serverDeleteProhibited']
d.save
@zonefile = ActiveRecord::Base.connection.execute(