Merge branch 'archive'

This commit is contained in:
Andres Keskküla 2014-10-22 12:37:52 +03:00
commit b354ad07f0
11 changed files with 64 additions and 59 deletions

View file

@ -80,18 +80,6 @@ describe 'EPP Contact', epp: true do
expect(id.text.length).to eq(8)
# 5 seconds for what-ever weird lag reasons might happen
expect(cr_date.text.to_time).to be_within(5).of(Time.now)
end
it 'does not create duplicate contact', pending: true do
Fabricate(:contact, code: 'sh8013')
response = epp_request(contact_create_xml, :xml)
expect(response[:result_code]).to eq('2302')
expect(response[:msg]).to eq('Contact id already exists')
expect(Contact.count).to eq(1)
end
end
@ -115,16 +103,6 @@ describe 'EPP Contact', epp: true do
expect(response[:result_code]).to eq('2201')
end
it 'stamps updated_by succesfully', pending: true do
Fabricate(:contact, code: 'sh8013', created_by_id: zone.id)
expect(Contact.first.updated_by_id).to be nil
epp_request(contact_update_xml, :xml)
expect(Contact.first.updated_by_id).to eq 2
end
it 'is succesful' do
Fabricate(
:contact,

View file

@ -7,13 +7,12 @@ end
describe Address, '.extract_params' do
# TODO: please fix
it 'returns params hash', pending: true do
it 'returns params hash' do
Fabricate(:country, iso: 'EE')
ph = { postalInfo: { name: 'fred', addr: { cc: 'EE', city: 'Village', street: %w(street1 street2) } } }
expect(Address.extract_attributes(ph[:postalInfo])).to eq({
address_attributes: {
country_id: 1,
country_id: Country.find_by(iso: 'EE').id,
city: 'Village',
street: 'street1',
street2: 'street2'

View file

@ -113,13 +113,12 @@ describe Domain do
context 'when saved' do
before(:each) do
Fabricate(:domain_validation_setting_group)
Fabricate(:dnskeys_setting_group)
# Fabricate(:domain_validation_setting_group)
# Fabricate(:dnskeys_setting_group)
Fabricate(:domain)
end
it 'creates domain version' do
expect(DomainVersion.count).to eq(1)
expect(ContactVersion.count).to eq(2)
expect(NameserverVersion.count).to eq(3)

View file

@ -2,9 +2,9 @@ require 'rails_helper'
describe DomainVersion do
with_versioning do
before(:each) { Fabricate(:domain_validation_setting_group); Fabricate(:dnskeys_setting_group) }
before(:each) do
Fabricate(:domain, name: 'version.ee') do
Setting.ns_min_count = 1
Fabricate(:domain, name: 'version.ee', dnskeys: []) do
owner_contact { Fabricate(:contact, name: 'owner_contact', code: 'asd', email: 'owner1@v.ee') }
nameservers(count: 1) { Fabricate(:nameserver, hostname: 'ns.test.ee') }
admin_contacts(count: 1) { Fabricate(:contact, name: 'admin_contact 1', code: 'qwe', email: 'admin1@v.ee') }
@ -58,42 +58,25 @@ describe DomainVersion do
it 'nameserver creates a version' do
expect(DomainVersion.count).to eq(1)
expect(Domain.last.nameservers.count).to eq(1)
Domain.last.nameservers << Fabricate(:nameserver, hostname: 'ns.server.ee')
Domain.last.nameservers << Fabricate(:nameserver, hostname: 'ns.server.ee', created_at: Time.now - 20)
expect(DomainVersion.count).to eq(2)
end
end
context 'when removing child' do
it('has one domain version before events') { expect(DomainVersion.count).to eq(1) }
before(:each) { Domain.last.nameservers << Fabricate(:nameserver) }
it 'contact creates a version' do
# FIXME: For some reason nameservers disappeared mid-test, but randomly stopped happening
expect(DomainVersion.count).to eq(1)
DomainContact.last.destroy
expect(Domain.last.valid?).to be(true)
expect(DomainVersion.count).to eq(2)
end
it 'nameserver creates a version' do
Domain.last.nameservers.last.destroy
expect(DomainVersion.count).to eq(1)
expect(Domain.last.nameservers.count).to eq(1)
expect(DomainVersion.load_snapshot).to eq(
admin_contacts: [{ name: 'admin_contact 1', phone: '+372.12345678',
code: 'qwe', ident: '37605030299', email: 'admin1@v.ee' }],
domain: { name: 'version.ee', status: nil },
nameservers: [{ hostname: 'ns.test.ee', ipv4: nil, ipv6: nil }],
owner_contact: { name: 'owner_contact', phone: '+372.12345678',
code: 'asd', ident: '37605030299', email: 'owner1@v.ee' },
tech_contacts: [{ name: 'tech_contact 1', phone: '+372.12345678',
code: 'zxc', ident: '37605030299', email: 'tech1@v.ee' }]
)
end
end
context 'when deleting children' do
it 'creates a version' do
context 'when deleting child' do
it 'contact creates a version' do
expect(DomainVersion.count).to eq(1)
Contact.find_by(name: 'tech_contact 1').destroy
expect(DomainVersion.count).to eq(2)
@ -107,6 +90,24 @@ describe DomainVersion do
tech_contacts: []
})
end
it 'nameserver creates a version' do
Domain.last.nameservers << Fabricate(:nameserver, created_at: Time.now - 30)
Domain.last.nameservers.last.destroy
expect(DomainVersion.count).to eq(3)
expect(Domain.last.nameservers.count).to eq(1)
expect(DomainVersion.last.load_snapshot).to eq(
admin_contacts: [{ name: 'admin_contact 1', phone: '+372.12345678',
code: 'qwe', ident: '37605030299', email: 'admin1@v.ee' }],
domain: { name: 'version.ee', status: nil },
nameservers: [{ hostname: 'ns.test.ee', ipv4: nil, ipv6: nil }],
owner_contact: { name: 'owner_contact', phone: '+372.12345678',
code: 'asd', ident: '37605030299', email: 'owner1@v.ee' },
tech_contacts: [{ name: 'tech_contact 1', phone: '+372.12345678',
code: 'zxc', ident: '37605030299', email: 'tech1@v.ee' }]
)
end
end
context 'when editing children' do