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

Conflicts:
	app/models/contact.rb
	db/schema.rb
This commit is contained in:
Andres Keskküla 2014-10-15 11:06:31 +03:00
commit 897ead3391
66 changed files with 1173 additions and 409 deletions

View file

@ -7,9 +7,13 @@ describe Domain do
it { should have_many(:tech_contacts) }
it { should have_many(:admin_contacts) }
it { should have_many(:domain_transfers) }
it { should have_many(:dnskeys) }
context 'with sufficient settings' do
before(:each) { Fabricate(:domain_validation_setting_group) }
before(:each) do
Fabricate(:domain_validation_setting_group)
Fabricate(:dnskeys_setting_group)
end
it 'validates domain name' do
d = Fabricate(:domain)