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

This commit is contained in:
Andres Keskküla 2014-10-16 12:39:27 +03:00
commit 02e313db46
41 changed files with 237 additions and 695 deletions

View file

@ -11,8 +11,8 @@ describe Address, '.extract_params' do
ph = { postalInfo: { name: 'fred', addr: { cc: 'EE', city: 'Village', street: %w(street1 street2) } } }
expect(Address.extract_attributes(ph[:postalInfo])).to eq({
address_attributes: {
city: 'Village',
country_id: 1,
city: 'Village',
street: 'street1',
street2: 'street2'
}

View file

@ -50,8 +50,7 @@ describe Contact, '#relations_with_domain?' do
context 'with relation' do
before(:each) do
Fabricate(:domain_validation_setting_group)
Fabricate(:dnskeys_setting_group)
create_settings
Fabricate(:domain)
end

View file

@ -2,8 +2,7 @@ require 'rails_helper'
describe Dnskey do
before(:each) do
Fabricate(:domain_validation_setting_group)
Fabricate(:dnskeys_setting_group)
create_settings
end
it { should belong_to(:domain) }

View file

@ -11,8 +11,7 @@ describe Domain do
context 'with sufficient settings' do
before(:each) do
Fabricate(:domain_validation_setting_group)
Fabricate(:dnskeys_setting_group)
create_settings
end
it 'validates domain name' do
@ -51,20 +50,13 @@ describe Domain do
period: ['is not a number'],
owner_contact: ['Registrant is missing'],
admin_contacts: ['Admin contacts count must be between 1 - infinity'],
nameservers: ['Nameservers count must be between 1-13'],
nameservers: ['Nameservers count must be between 2-11'],
registrar: ['Registrar is missing'],
period: ['Period is not a number']
})
sg = SettingGroup.domain_validation
min = sg.setting(:ns_min_count)
max = sg.setting(:ns_max_count)
min.value = 2
min.save
max.value = 7
max.save
Setting.ns_min_count = 2
Setting.ns_max_count = 7
expect(d.valid?).to be false
expect(d.errors.messages[:nameservers]).to eq(['Nameservers count must be between 2-7'])

View file

@ -1,5 +0,0 @@
require 'rails_helper'
describe SettingGroup do
it { should have_many(:settings) }
end

View file

@ -1,21 +1,12 @@
require 'rails_helper'
describe Setting do
it { should belong_to(:setting_group) }
it 'validates code uniqueness' do
sg = Fabricate(:setting_group)
sg.settings.build(code: 'this_is_code')
expect(sg.save).to be true
sg.settings.build(code: 'this_is_code')
expect(sg.save).to be false
err = sg.settings.last.errors[:code].first
expect(err).to eq('Code already exists')
sg_2 = Fabricate(:setting_group, code: 'domain_statuses')
sg_2.settings.build(code: 'this_is_code')
expect(sg_2.save).to be true
it 'returns value' do
create_settings
expect(Setting.ns_min_count).to eq(2)
Setting.ns_min_count = '2'
expect(Setting.ns_min_count).to eq('2')
Setting.ns_min_count = true
expect(Setting.ns_min_count).to eq(true)
end
end