zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-03 09:43:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Show valid values on flags and protocol too

Browse source
This commit is contained in:
Martin Lensment 2014-10-08 13:49:08 +03:00
parent 2e50e4c5e6
commit acb0c10561
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/models/dnskey.rb
View file

@ -16,8 +16,8 @@ class Dnskey < ActiveRecord::Base
{ {
'2005' => [ '2005' => [
[:alg, :invalid, { value: { obj: 'alg', val: alg }, values: ALGORITHMS.join(', ') }], [:alg, :invalid, { value: { obj: 'alg', val: alg }, values: ALGORITHMS.join(', ') }],
[:protocol, :invalid, { value: { obj: 'protocol', val: protocol } }], [:protocol, :invalid, { value: { obj: 'protocol', val: protocol }, values: PROTOCOLS.join(', ') }],
[:flags, :invalid, { value: { obj: 'flags', val: flags } }] [:flags, :invalid, { value: { obj: 'flags', val: flags }, values: FLAGS.join(', ') }]
], ],
'2302' => [ '2302' => [
[:public_key, :taken, { value: { obj: 'pubKye', val: public_key } }] [:public_key, :taken, { value: { obj: 'pubKye', val: public_key } }]
@ -42,13 +42,13 @@ class Dnskey < ActiveRecord::Base
def validate_protocol def validate_protocol
return if protocol.blank? return if protocol.blank?
return if %w(3).include?(protocol.to_s) return if PROTOCOLS.include?(protocol.to_s)
errors.add(:protocol, :invalid) errors.add(:protocol, :invalid, values: PROTOCOLS.join(', '))
end end
def validate_flags def validate_flags
return if flags.blank? return if flags.blank?
return if %w(0 256 257).include?(flags.to_s) return if FLAGS.include?(flags.to_s)
errors.add(:flags, :invalid) errors.add(:flags, :invalid, values: FLAGS.join(', '))
end end
end end

6
config/locales/en.yml
View file

@ -191,13 +191,13 @@ en:
dnskey: dnskey:
attributes: attributes:
alg: alg:
invalid: 'Valid algorithms are %{values}' invalid: 'Valid algorithms are: %{values}'
blank: 'Algorithm is missing' blank: 'Algorithm is missing'
protocol: protocol:
invalid: 'Protocol is invalid' invalid: 'Valid protocols are: %{values}'
blank: 'Protocol is missing' blank: 'Protocol is missing'
flags: flags:
invalid: 'Flag is invalid' invalid: 'Valid flags are: %{values}'
blank: 'Flag is missing' blank: 'Flag is missing'
public_key: public_key:
taken: 'Public key already exists' taken: 'Public key already exists'

12
spec/epp/domain_spec.rb
View file

@ -398,24 +398,24 @@ describe 'EPP Domain', epp: true do
response = epp_request(xml, :xml) response = epp_request(xml, :xml)
expect(response[:results][0][:msg]).to eq('Valid algorithms are 3, 5, 6, 7, 8, 252, 253, 254, 255') expect(response[:results][0][:msg]).to eq('Valid algorithms are: 3, 5, 6, 7, 8, 252, 253, 254, 255')
expect(response[:results][0][:value]).to eq('9') expect(response[:results][0][:value]).to eq('9')
expect(response[:results][1][:msg]).to eq('Protocol is invalid') expect(response[:results][1][:msg]).to eq('Valid protocols are: 3')
expect(response[:results][1][:value]).to eq('4') expect(response[:results][1][:value]).to eq('4')
expect(response[:results][2][:msg]).to eq('Flag is invalid') expect(response[:results][2][:msg]).to eq('Valid flags are: 0, 256, 257')
expect(response[:results][2][:value]).to eq('250') expect(response[:results][2][:value]).to eq('250')
expect(response[:results][3][:msg]).to eq('Valid algorithms are 3, 5, 6, 7, 8, 252, 253, 254, 255') expect(response[:results][3][:msg]).to eq('Valid algorithms are: 3, 5, 6, 7, 8, 252, 253, 254, 255')
expect(response[:results][3][:value]).to eq('10') expect(response[:results][3][:value]).to eq('10')
expect(response[:results][4][:msg]).to eq('Flag is invalid') expect(response[:results][4][:msg]).to eq('Valid flags are: 0, 256, 257')
expect(response[:results][4][:value]).to eq('1') expect(response[:results][4][:value]).to eq('1')
expect(response[:results][5][:msg]).to eq('Public key is missing') expect(response[:results][5][:msg]).to eq('Public key is missing')
expect(response[:results][6][:msg]).to eq('Protocol is invalid') expect(response[:results][6][:msg]).to eq('Valid protocols are: 3')
expect(response[:results][6][:value]).to eq('5') expect(response[:results][6][:value]).to eq('5')
end end