Fix rubocop

This commit is contained in:
Martin Lensment 2015-01-29 10:53:28 +02:00
parent d8ba91ec88
commit c1e91a0703
6 changed files with 103 additions and 101 deletions

View file

@ -74,7 +74,7 @@ class EppController < ApplicationController
# Adds error to epp_errors if element is missing or blank # Adds error to epp_errors if element is missing or blank
# Returns last element of selectors if it exists # Returns last element of selectors if it exists
# #
# requires 'transfer' # requires 'transfer'
# #
# TODO: Add possibility to pass validations / options in the method # TODO: Add possibility to pass validations / options in the method

View file

@ -341,79 +341,79 @@ describe 'EPP Contact', epp: true do
end end
# it 'returns auth error for non-owner with wrong password' do # it 'returns auth error for non-owner with wrong password' do
# @contact = Fabricate(:contact, # @contact = Fabricate(:contact,
# registrar: registrar2, code: 'info-4444', name: 'Johnny Awesome', auth_info: 'asde', # registrar: registrar2, code: 'info-4444', name: 'Johnny Awesome', auth_info: 'asde',
# address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false)) # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false))
# xml = epp_xml.info({ id: { value: @contact.code }, authInfo: { pw: { value: 'asdesde' } } }) # xml = epp_xml.info({ id: { value: @contact.code }, authInfo: { pw: { value: 'asdesde' } } })
# response = epp_plain_request(xml, :xml, :registrar1) # response = epp_plain_request(xml, :xml, :registrar1)
# expect(response[:result_code]).to eq('2200') # expect(response[:result_code]).to eq('2200')
# expect(response[:msg]).to eq('Authentication error') # expect(response[:msg]).to eq('Authentication error')
# end # end
context 'about disclose' do context 'about disclose' do
# it 'discloses items with wrong password when queried by owner' do # it 'discloses items with wrong password when queried by owner' do
# @contact = Fabricate(:contact, # @contact = Fabricate(:contact,
# registrar: registrar1, code: 'info-4444', # registrar: registrar1, code: 'info-4444',
# name: 'Johnny Awesome', auth_info: 'asde', # name: 'Johnny Awesome', auth_info: 'asde',
# address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false)) # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false))
# xml = epp_xml.info({ id: { value: @contact.code } }) # xml = epp_xml.info({ id: { value: @contact.code } })
# login_as :registrar1 do # login_as :registrar1 do
# response = epp_plain_request(xml, :xml) # response = epp_plain_request(xml, :xml)
# contact = response[:parsed].css('resData chkData') # contact = response[:parsed].css('resData chkData')
# expect(response[:result_code]).to eq('1000') # expect(response[:result_code]).to eq('1000')
# expect(response[:msg]).to eq('Command completed successfully') # expect(response[:msg]).to eq('Command completed successfully')
# expect(contact.css('name').first.text).to eq('Johnny Awesome') # expect(contact.css('name').first.text).to eq('Johnny Awesome')
# end # end
# end # end
# it 'doesn\'t disclose items to non-owner with right password' do # it 'doesn\'t disclose items to non-owner with right password' do
# @contact = Fabricate(:contact, registrar: registrar2, code: 'info-4444', # @contact = Fabricate(:contact, registrar: registrar2, code: 'info-4444',
# name: 'Johnny Awesome', auth_info: 'password', # name: 'Johnny Awesome', auth_info: 'password',
# address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false)) # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false))
# xml = epp_xml.info({ id: { value: @contact.code }, authInfo: { pw: { value: 'password' } } }) # xml = epp_xml.info({ id: { value: @contact.code }, authInfo: { pw: { value: 'password' } } })
# response = epp_plain_request(xml, :xml, :registrar1) # response = epp_plain_request(xml, :xml, :registrar1)
# contact = response[:parsed].css('resData chkData') # contact = response[:parsed].css('resData chkData')
# expect(response[:result_code]).to eq('1000') # expect(response[:result_code]).to eq('1000')
# expect(response[:msg]).to eq('Command completed successfully') # expect(response[:msg]).to eq('Command completed successfully')
# expect(contact.css('chkData postalInfo name').first).to eq(nil) # expect(contact.css('chkData postalInfo name').first).to eq(nil)
# end # end
# it 'discloses items to owner' do # it 'discloses items to owner' do
# @contact = Fabricate(:contact, registrar: registrar1, code: 'info-4444', name: 'Johnny Awesome', # @contact = Fabricate(:contact, registrar: registrar1, code: 'info-4444', name: 'Johnny Awesome',
# auth_info: 'password', # auth_info: 'password',
# address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false)) # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false))
# xml = epp_xml.info({ id: { value: @contact.code } }) # xml = epp_xml.info({ id: { value: @contact.code } })
# response = epp_plain_request(xml, :xml, :registrar1) # response = epp_plain_request(xml, :xml, :registrar1)
# contact = response[:parsed].css('resData chkData') # contact = response[:parsed].css('resData chkData')
# expect(response[:result_code]).to eq('1000') # expect(response[:result_code]).to eq('1000')
# expect(response[:msg]).to eq('Command completed successfully') # expect(response[:msg]).to eq('Command completed successfully')
# expect(contact.css('name').first.text).to eq('Johnny Awesome') # expect(contact.css('name').first.text).to eq('Johnny Awesome')
# end # end
# it 'doesn\'t disclose private elements' do # it 'doesn\'t disclose private elements' do
# Fabricate(:contact, code: 'info-4444', auth_info: '2fooBAR', registrar: registrar2, # Fabricate(:contact, code: 'info-4444', auth_info: '2fooBAR', registrar: registrar2,
# disclosure: Fabricate(:contact_disclosure, name: true, email: false, phone: false)) # disclosure: Fabricate(:contact_disclosure, name: true, email: false, phone: false))
# xml = epp_xml.info({ id: { value: 'info-4444' }, authInfo: { pw: { value: '2fooBAR' } } }) # xml = epp_xml.info({ id: { value: 'info-4444' }, authInfo: { pw: { value: '2fooBAR' } } })
# response = epp_plain_request(xml, :xml, :registrar1) # response = epp_plain_request(xml, :xml, :registrar1)
# contact = response[:parsed].css('resData chkData') # contact = response[:parsed].css('resData chkData')
# expect(response[:result_code]).to eq('1000') # expect(response[:result_code]).to eq('1000')
# expect(contact.css('chkData phone')).to eq(contact.css('chkData disclose phone')) # expect(contact.css('chkData phone')).to eq(contact.css('chkData disclose phone'))
# expect(contact.css('chkData phone').count).to eq(1) # expect(contact.css('chkData phone').count).to eq(1)
# expect(contact.css('chkData email')).to eq(contact.css('chkData disclose email')) # expect(contact.css('chkData email')).to eq(contact.css('chkData disclose email'))
# expect(contact.css('chkData email').count).to eq(1) # expect(contact.css('chkData email').count).to eq(1)
# expect(contact.css('postalInfo name').present?).to be(true) # expect(contact.css('postalInfo name').present?).to be(true)
# end # end
end end

View file

@ -629,7 +629,8 @@ describe 'EPP Domain', epp: true do
}) })
response = epp_plain_request(xml, :xml) response = epp_plain_request(xml, :xml)
response[:msg].should == 'Mutually exclusive parameters: extension > create > keyData, extension > create > dsData' response[:msg].should == 'Mutually exclusive parameters: extension > create > keyData, '\
'extension > create > dsData'
response[:result_code].should == '2306' response[:result_code].should == '2306'
end end
end end

View file

@ -163,7 +163,8 @@ describe 'EPP Keyrelay', epp: true do
}) })
response = epp_request(xml, :xml, :elkdata) response = epp_request(xml, :xml, :elkdata)
response[:msg].should == 'Exactly one parameter required: keyrelay > expiry > relative OR keyrelay > expiry > absolute' response[:msg].should == 'Exactly one parameter required: keyrelay > expiry > relative OR '\
'keyrelay > expiry > absolute'
@zone.messages.queued.count.should == msg_count @zone.messages.queued.count.should == msg_count
end end

View file

@ -58,16 +58,16 @@ describe Contact do
end end
# it 'ico should be valid' do # it 'ico should be valid' do
# @contact.ident_type = 'ico' # @contact.ident_type = 'ico'
# @contact.ident = '1234' # @contact.ident = '1234'
# @contact.errors.full_messages.should match_array([]) # @contact.errors.full_messages.should match_array([])
# end # end
# it 'ident should return false' do # it 'ident should return false' do
# puts @contact.ident_type # puts @contact.ident_type
# @contact.ident = '123abc' # @contact.ident = '123abc'
# @contact.valid? # @contact.valid?
# @contact.errors.full_messages.should_not == [] # @contact.errors.full_messages.should_not == []
# end # end
context 'as birthday' do context 'as birthday' do
@ -176,17 +176,17 @@ end
# TODO: investigate it a bit more # TODO: investigate it a bit more
# describe Contact, '#relations_with_domain?' do # describe Contact, '#relations_with_domain?' do
# context 'with relation' do # context 'with relation' do
# before :all do # before :all do
# create_settings # create_settings
# Fabricate(:domain) # Fabricate(:domain)
# @contact = Fabricate(:contact) # @contact = Fabricate(:contact)
# end # end
# it 'should have relation with domain' do # it 'should have relation with domain' do
# @contact.relations_with_domain?.should == true # @contact.relations_with_domain?.should == true
# end # end
# end # end
# end # end
describe Contact, '.extract_params' do describe Contact, '.extract_params' do

View file

@ -16,50 +16,50 @@ describe Domain do
end end
# it 'validates domain name', skip: true do # it 'validates domain name', skip: true do
# d = Fabricate(:domain) # d = Fabricate(:domain)
# expect(d.name).to_not be_nil # expect(d.name).to_not be_nil
# invalid = ['a.ee', "#{'a' * 64}.ee", 'ab.eu', 'test.ab.ee', '-test.ee', '-test-.ee', 'test-.ee', 'te--st.ee', # invalid = ['a.ee', "#{'a' * 64}.ee", 'ab.eu', 'test.ab.ee', '-test.ee', '-test-.ee', 'test-.ee', 'te--st.ee',
# 'õ.pri.ee', 'test.com', 'www.ab.ee', 'test.eu', ' .ee', 'a b.ee', 'Ž .ee', 'test.edu.ee'] # 'õ.pri.ee', 'test.com', 'www.ab.ee', 'test.eu', ' .ee', 'a b.ee', 'Ž .ee', 'test.edu.ee']
# invalid.each do |x| # invalid.each do |x|
# expect(Fabricate.build(:domain, name: x).valid?).to be false # expect(Fabricate.build(:domain, name: x).valid?).to be false
# end # end
# valid = ['ab.ee', "#{'a' * 63}.ee", 'te-s-t.ee', 'jäääär.ee', 'päike.pri.ee', # valid = ['ab.ee', "#{'a' * 63}.ee", 'te-s-t.ee', 'jäääär.ee', 'päike.pri.ee',
# 'õigus.com.ee', 'õäöü.fie.ee', 'test.med.ee', 'žä.ee', ' ŽŠ.ee '] # 'õigus.com.ee', 'õäöü.fie.ee', 'test.med.ee', 'žä.ee', ' ŽŠ.ee ']
# valid.each do |x| # valid.each do |x|
# expect(Fabricate.build(:domain, name: x).valid?).to be true # expect(Fabricate.build(:domain, name: x).valid?).to be true
# end # end
# invalid_punycode = ['xn--geaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-4we.pri.ee'] # invalid_punycode = ['xn--geaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-4we.pri.ee']
# invalid_punycode.each do |x| # invalid_punycode.each do |x|
# expect(Fabricate.build(:domain, name: x).valid?).to be false # expect(Fabricate.build(:domain, name: x).valid?).to be false
# end # end
# valid_punycode = ['xn--ge-uia.pri.ee', 'xn--geaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-9te.pri.ee'] # valid_punycode = ['xn--ge-uia.pri.ee', 'xn--geaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-9te.pri.ee']
# valid_punycode.each do |x| # valid_punycode.each do |x|
# expect(Fabricate.build(:domain, name: x).valid?).to be true # expect(Fabricate.build(:domain, name: x).valid?).to be true
# end # end
# d = Domain.new # d = Domain.new
# expect(d.valid?).to be false # expect(d.valid?).to be false
# expect(d.errors.messages).to match_array({ # expect(d.errors.messages).to match_array({
# owner_contact: ['Registrant is missing'], # owner_contact: ['Registrant is missing'],
# admin_contacts: ['Admin contacts count must be between 1 - infinity'], # admin_contacts: ['Admin contacts count must be between 1 - infinity'],
# nameservers: ['Nameservers count must be between 2-11'], # nameservers: ['Nameservers count must be between 2-11'],
# registrar: ['Registrar is missing'], # registrar: ['Registrar is missing'],
# period: ['Period is not a number'] # period: ['Period is not a number']
# }) # })
# Setting.ns_min_count = 2 # Setting.ns_min_count = 2
# Setting.ns_max_count = 7 # Setting.ns_max_count = 7
# expect(d.valid?).to be false # expect(d.valid?).to be false
# expect(d.errors.messages[:nameservers]).to eq(['Nameservers count must be between 2-7']) # expect(d.errors.messages[:nameservers]).to eq(['Nameservers count must be between 2-7'])
# end # end
it 'downcases domain' do it 'downcases domain' do