style fixes

This commit is contained in:
Andres Keskküla 2014-08-29 13:14:20 +03:00
parent 22f753aa6c
commit 0e655bf306
7 changed files with 20 additions and 18 deletions

View file

@ -63,10 +63,12 @@ module Epp::Common
epp_errors.empty?
end
def xml_attrs_array_present?(array_ph, attributes )
def xml_attrs_array_present?(array_ph, attributes)
[array_ph].flatten.each do |ph|
attributes.each do |x|
epp_errors << {code: '2003', msg: I18n.t('errors.messages.required_parameter_missing', key: x.last)} unless has_attribute(ph, x)
unless has_attribute(ph, x)
epp_errors << { code: '2003', msg: I18n.t('errors.messages.required_parameter_missing', key: x.last) }
end
end
end
epp_errors.empty?

View file

@ -14,10 +14,8 @@ class Address < ActiveRecord::Base
# validates_inclusion_of :type, in: TYPES
class << self
def validate_postal_info_types(parsed_frame)
errors, used = [], []
parsed_frame.css('postalInfo').each do |pi|
attr = pi.attributes['type'].try(:value)
errors << { code: 2003, msg: I18n.t('errors.messages.attr_missing', key: 'type') } and next unless attr
@ -27,8 +25,7 @@ class Address < ActiveRecord::Base
end
errors << { code: 2005, msg: I18n.t('errors.messages.repeating_postal_info') } and next if used.include?(attr)
used << attr
end
errors
end; errors
end
def extract_attributes(ah)

View file

@ -19,13 +19,13 @@ class EppSession < ActiveRecord::Base
end
class << self
def marshal(data)
::Base64.encode64(Marshal.dump(data)) if data
end
def marshal(data)
::Base64.encode64(Marshal.dump(data)) if data
end
def unmarshal(data)
return data unless data.is_a? String
Marshal.load(::Base64.decode64(data)) if data
end
def unmarshal(data)
return data unless data.is_a? String
Marshal.load(::Base64.decode64(data)) if data
end
end
end

View file

@ -31,7 +31,8 @@ describe 'EPP Domain', epp: true do
context 'with two epp users' do
before(:each) do
elkdata = Fabricate(:registrar,
elkdata = Fabricate(
:registrar,
name: 'Elkdata',
reg_no: '123'
)

View file

@ -222,7 +222,8 @@ describe 'EPP Helper', epp: true do
</epp>
').to_s.squish
generated = Nokogiri::XML(domain_renew_xml(name: 'one.ee', curExpDate: '2009-11-15', period_value: '365', period_unit: 'd')).to_s.squish
generated = Nokogiri::XML(domain_renew_xml(name: 'one.ee', curExpDate: '2009-11-15',
period_value: '365', period_unit: 'd')).to_s.squish
expect(generated).to eq(expected)
end

View file

@ -25,4 +25,3 @@ describe '.extract_attributes' do
expect(result).to eq({ phone: '0', email: '0' })
end
end

View file

@ -15,13 +15,15 @@ describe Domain do
d = Fabricate(:domain)
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', 'õ.pri.ee', 'test.com', 'www.ab.ee', 'test.eu', ' .ee', 'a b.ee', 'Ž .ee', 'test.edu.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']
invalid.each do |x|
expect(Fabricate.build(:domain, name: x).valid?).to be false
end
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 ']
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 ']
valid.each do |x|
expect(Fabricate.build(:domain, name: x).valid?).to be true