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

Fix tests #2845

Browse source
This commit is contained in:
Martin Lensment 2015-08-10 17:36:14 +03:00
parent 81d704e4f5
commit 65d67e16a3
2 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
db/structure.sql
View file

@ -93,7 +93,7 @@ CREATE FUNCTION generate_zonefile(i_origin character varying) RETURNS text
FROM domains d FROM domains d
JOIN nameservers ns ON ns.domain_id = d.id JOIN nameservers ns ON ns.domain_id = d.id
WHERE d.name LIKE include_filter AND d.name NOT LIKE exclude_filter WHERE d.name LIKE include_filter AND d.name NOT LIKE exclude_filter
AND NOT ('{serverHold}' && d.statuses) AND NOT ('{serverHold,clientHold}' && d.statuses)
ORDER BY d.name ORDER BY d.name
), ),
chr(10) chr(10)
@ -115,7 +115,7 @@ CREATE FUNCTION generate_zonefile(i_origin character varying) RETURNS text
AND ns.hostname LIKE '%.' || d.name AND ns.hostname LIKE '%.' || d.name
AND d.name <> i_origin AND d.name <> i_origin
AND ns.ipv4 IS NOT NULL AND ns.ipv4 <> '' AND ns.ipv4 IS NOT NULL AND ns.ipv4 <> ''
AND NOT ('{serverHold}' && d.statuses) AND NOT ('{serverHold,clientHold}' && d.statuses)
), chr(10) ), chr(10)
) INTO tmp_var; ) INTO tmp_var;
@ -135,7 +135,7 @@ CREATE FUNCTION generate_zonefile(i_origin character varying) RETURNS text
AND ns.hostname LIKE '%.' || d.name AND ns.hostname LIKE '%.' || d.name
AND d.name <> i_origin AND d.name <> i_origin
AND ns.ipv6 IS NOT NULL AND ns.ipv6 <> '' AND ns.ipv6 IS NOT NULL AND ns.ipv6 <> ''
AND NOT ('{serverHold}' && d.statuses) AND NOT ('{serverHold,clientHold}' && d.statuses)
), chr(10) ), chr(10)
) INTO tmp_var; ) INTO tmp_var;
@ -151,7 +151,7 @@ CREATE FUNCTION generate_zonefile(i_origin character varying) RETURNS text
FROM domains d FROM domains d
JOIN dnskeys dk ON dk.domain_id = d.id JOIN dnskeys dk ON dk.domain_id = d.id
WHERE d.name LIKE include_filter AND d.name NOT LIKE exclude_filter AND dk.flags = 257 WHERE d.name LIKE include_filter AND d.name NOT LIKE exclude_filter AND dk.flags = 257
AND NOT ('{serverHold}' && d.statuses) AND NOT ('{serverHold,clientHold}' && d.statuses)
), ),
chr(10) chr(10)
) INTO tmp_var; ) INTO tmp_var;

25
spec/models/domain_spec.rb
View file

@ -236,7 +236,10 @@ describe Domain do
DomainStatus::PENDING_TRANSFER, DomainStatus::PENDING_TRANSFER,
DomainStatus::PENDING_RENEW, DomainStatus::PENDING_RENEW,
DomainStatus::PENDING_CREATE, DomainStatus::PENDING_CREATE,
DomainStatus::CLIENT_HOLD DomainStatus::CLIENT_HOLD,
DomainStatus::EXPIRED,
DomainStatus::SERVER_HOLD,
DomainStatus::DELETE_CANDIDATE,
] ]
@domain.save @domain.save
@ -244,18 +247,32 @@ describe Domain do
@domain.set_force_delete @domain.set_force_delete
@domain.statuses.should match_array([ @domain.statuses.should match_array([
"clientHold",
"deleteCandidate",
"expired",
"forceDelete", "forceDelete",
"pendingDelete", "pendingDelete",
"serverHold",
"serverManualInzone", "serverManualInzone",
"serverRenewProhibited", "serverRenewProhibited",
"serverTransferProhibited", "serverTransferProhibited",
"serverUpdateProhibited", "serverUpdateProhibited"
"clientHold"
]) ])
@domain.unset_force_delete @domain.unset_force_delete
@domain.statuses.should == ['clientHold'] @domain.statuses.should match_array([
"clientDeleteProhibited",
"clientHold",
"deleteCandidate",
"expired",
"pendingCreate",
"pendingRenew",
"pendingTransfer",
"pendingUpdate",
"serverDeleteProhibited",
"serverHold"
])
end end
it 'should set expired status and update outzone_at and delete_at' do it 'should set expired status and update outzone_at and delete_at' do