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

Rubocop fixes

Browse source
This commit is contained in:
Andres Keskküla 2014-10-15 12:15:30 +03:00
parent 897ead3391
commit 7b05cef8ea
3 changed files with 49 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/models/domain.rb
View file

@ -69,9 +69,9 @@ class Domain < ActiveRecord::Base
oc = owner_contact.snapshot if owner_contact.is_a?(Contact) oc = owner_contact.snapshot if owner_contact.is_a?(Contact)
{ {
owner_contact: oc, owner_contact: oc,
tech_contacts: tech_contacts.map{ |tc| tc.snapshot }, tech_contacts: tech_contacts.map(&:snapshot),
admin_contacts: admin_contacts.map{ |ac| ac.snapshot }, admin_contacts: admin_contacts.map(&:snapshot),
nameservers: nameservers.map{ |ns| ns.snapshot }, nameservers: nameservers.map(&:snapshot),
domain: make_snapshot domain: make_snapshot
}.to_yaml }.to_yaml
end end
@ -293,25 +293,24 @@ class Domain < ActiveRecord::Base
private private
#for archiving # for archiving
#def version_owner # def version_owner
# return nil unless owner_contact # return nil unless owner_contact
# owner_contact.id # owner_contact.id
#end # end
#def version_admin_contacts # def version_admin_contacts
# return nil unless admin_contacts # return nil unless admin_contacts
# return admin_contacts.map { |ns| ns.id } # return admin_contacts.map { |ns| ns.id }
#end # end
#def version_tech_contacts # def version_tech_contacts
# return nil unless tech_contacts # return nil unless tech_contacts
# return tech_contacts.map { |ns| ns.id } # return tech_contacts.map { |ns| ns.id }
#end # end
#def version_nameservers # def version_nameservers
# return nil unless nameservers # return nil unless nameservers
# return nameservers.map { |ns| ns.id } # return nameservers.map { |ns| ns.id }
#end # end
end end

7
spec/models/domain_spec.rb
View file

@ -102,7 +102,12 @@ describe Domain do
end end
context 'when saved' do context 'when saved' do
before(:each) { Fabricate(:domain_validation_setting_group); Fabricate(:domain) } before(:each) do
Fabricate(:domain_validation_setting_group)
Fabricate(:dnskeys_setting_group)
Fabricate(:domain)
end
it 'creates domain version' do it 'creates domain version' do
expect(DomainVersion.count).to eq(1) expect(DomainVersion.count).to eq(1)

53
spec/models/domain_version_spec.rb
View file

@ -2,11 +2,11 @@ require 'rails_helper'
describe DomainVersion do describe DomainVersion do
with_versioning do with_versioning do
before(:each) { Fabricate(:domain_validation_setting_group) } before(:each) { Fabricate(:domain_validation_setting_group); Fabricate(:dnskeys_setting_group) }
before(:each) do before(:each) do
Fabricate(:domain, name: 'version.ee') do Fabricate(:domain, name: 'version.ee') do
owner_contact { Fabricate(:contact, name: 'owner_contact', code: 'asd', email: 'owner1@v.ee') } owner_contact { Fabricate(:contact, name: 'owner_contact', code: 'asd', email: 'owner1@v.ee') }
nameservers(count: 1) { Fabricate(:nameserver, hostname: 'ns.test.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') } admin_contacts(count: 1) { Fabricate(:contact, name: 'admin_contact 1', code: 'qwe', email: 'admin1@v.ee') }
tech_contacts(count: 1) { Fabricate(:contact, name: 'tech_contact 1', code: 'zxc', email: 'tech1@v.ee') } tech_contacts(count: 1) { Fabricate(:contact, name: 'tech_contact 1', code: 'zxc', email: 'tech1@v.ee') }
end end
@ -17,11 +17,14 @@ describe DomainVersion do
it('has a snapshot') { expect(DomainVersion.first.snapshot).not_to be_empty } it('has a snapshot') { expect(DomainVersion.first.snapshot).not_to be_empty }
it 'has a snapshot with correct info' do it 'has a snapshot with correct info' do
expect(DomainVersion.last.load_snapshot).to eq({ expect(DomainVersion.last.load_snapshot).to eq({
:admin_contacts => [{:name=>"admin_contact 1", :phone=>"+372.12345678", :code=>"qwe", :ident=>"37605030299", :email=>"admin1@v.ee"}], admin_contacts: [{ name: 'admin_contact 1', phone: '+372.12345678',
:domain => {:name=>"version.ee", :status=>nil}, code: 'qwe', ident: '37605030299', email: 'admin1@v.ee' }],
:nameservers => [{:hostname=>"ns.test.ee", :ipv4=>nil, :ipv6=>nil}], domain: { name: 'version.ee', status: nil },
:owner_contact => {:name=>"owner_contact", :phone=>"+372.12345678", :code=>"asd", :ident=>"37605030299", :email=>"owner1@v.ee"}, nameservers: [{ hostname: 'ns.test.ee', ipv4: nil, ipv6: nil }],
:tech_contacts => [{:name=>"tech_contact 1", :phone=>"+372.12345678", :code=>"zxc", :ident=>"37605030299", :email=>"tech1@v.ee"}] 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
end end
@ -32,11 +35,12 @@ describe DomainVersion do
Domain.first.destroy Domain.first.destroy
expect(DomainVersion.count).to eq(2) expect(DomainVersion.count).to eq(2)
expect(DomainVersion.last.load_snapshot).to eq({ expect(DomainVersion.last.load_snapshot).to eq({
:admin_contacts => [], admin_contacts: [],
:domain => {:name=>"version.ee", :status=>nil}, domain: { name: 'version.ee', status: nil },
:nameservers => [], nameservers: [],
:owner_contact => {:name=>"owner_contact", :phone=>"+372.12345678", :code=>"asd", :ident=>"37605030299", :email=>"owner1@v.ee"}, owner_contact: { name: 'owner_contact', phone: '+372.12345678',
:tech_contacts => [] code: 'asd', ident: '37605030299', email: 'owner1@v.ee' },
tech_contacts: []
}) })
end end
end end
@ -47,11 +51,13 @@ describe DomainVersion do
Contact.find_by(name: 'tech_contact 1').destroy Contact.find_by(name: 'tech_contact 1').destroy
expect(DomainVersion.count).to eq(2) expect(DomainVersion.count).to eq(2)
expect(DomainVersion.last.load_snapshot).to eq({ expect(DomainVersion.last.load_snapshot).to eq({
:admin_contacts => [{:name=>"admin_contact 1", :phone=>"+372.12345678", :code=>"qwe", :ident=>"37605030299", :email=>"admin1@v.ee"}], admin_contacts: [{ name: 'admin_contact 1', phone: '+372.12345678',
:domain => {:name=>"version.ee", :status=>nil}, code: 'qwe', ident: '37605030299', email: 'admin1@v.ee' }],
:nameservers => [{:hostname=>"ns.test.ee", :ipv4=>nil, :ipv6=>nil}], domain: { name: 'version.ee', status: nil },
:owner_contact => {:name=>"owner_contact", :phone=>"+372.12345678", :code=>"asd", :ident=>"37605030299", :email=>"owner1@v.ee"}, nameservers: [{ hostname: 'ns.test.ee', ipv4: nil, ipv6: nil }],
:tech_contacts => [] owner_contact: { name: 'owner_contact', phone: '+372.12345678',
code: 'asd', ident: '37605030299', email: 'owner1@v.ee' },
tech_contacts: []
}) })
end end
end end
@ -72,11 +78,14 @@ describe DomainVersion do
Contact.find_by(name: 'admin_contact 1').update_attributes!(name: 'edited admin_contact') Contact.find_by(name: 'admin_contact 1').update_attributes!(name: 'edited admin_contact')
expect(DomainVersion.count).to eq(4) expect(DomainVersion.count).to eq(4)
expect(DomainVersion.last.load_snapshot).to eq({ expect(DomainVersion.last.load_snapshot).to eq({
:admin_contacts => [{:name=>"edited admin_contact", :phone=>"+372.12345678", :code=>"qwe", :ident=>"37605030299", :email=>"admin1@v.ee"}], admin_contacts: [{ name: 'edited admin_contact', phone: '+372.12345678',
:domain => {:name=>"version.ee", :status=>nil}, code: 'qwe', ident: '37605030299', email: 'admin1@v.ee' }],
:nameservers => [{:hostname=>"ns.test.ee", :ipv4=>nil, :ipv6=>nil}], domain: { name: 'version.ee', status: nil },
:owner_contact => {:name=>"edited owner_contact", :phone=>"+372.12345678", :code=>"asd", :ident=>"37605030299", :email=>"owner1@v.ee"}, nameservers: [{ hostname: 'ns.test.ee', ipv4: nil, ipv6: nil }],
:tech_contacts => [{:name=>"edited tech_contact", :phone=>"+372.12345678", :code=>"zxc", :ident=>"37605030299", :email=>"tech1@v.ee"}] owner_contact: { name: 'edited owner_contact', phone: '+372.12345678',
code: 'asd', ident: '37605030299', email: 'owner1@v.ee' },
tech_contacts: [{ name: 'edited tech_contact', phone: '+372.12345678',
code: 'zxc', ident: '37605030299', email: 'tech1@v.ee' }]
}) })
end end
end end