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 algorithms when invalid

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

6
app/models/dnskey.rb
View file

@ -15,7 +15,7 @@ class Dnskey < ActiveRecord::Base
def epp_code_map def epp_code_map
{ {
'2005' => [ '2005' => [
[:alg, :invalid, { value: { obj: 'alg', val: alg } }], [:alg, :invalid, { value: { obj: 'alg', val: alg }, values: ALGORITHMS.join(', ') }],
[:protocol, :invalid, { value: { obj: 'protocol', val: protocol } }], [:protocol, :invalid, { value: { obj: 'protocol', val: protocol } }],
[:flags, :invalid, { value: { obj: 'flags', val: flags } }] [:flags, :invalid, { value: { obj: 'flags', val: flags } }]
], ],
@ -36,8 +36,8 @@ class Dnskey < ActiveRecord::Base
def validate_algorithm def validate_algorithm
return if alg.blank? return if alg.blank?
return if %w(3 5 6 7 8 252 253 254 255).include?(alg.to_s) return if ALGORITHMS.include?(alg.to_s)
errors.add(:alg, :invalid) errors.add(:alg, :invalid, values: ALGORITHMS.join(', '))
end end
def validate_protocol def validate_protocol

2
config/locales/en.yml
View file

@ -191,7 +191,7 @@ en:
dnskey: dnskey:
attributes: attributes:
alg: alg:
invalid: 'Algorithm is invalid' invalid: 'Valid algorithms are %{values}'
blank: 'Algorithm is missing' blank: 'Algorithm is missing'
protocol: protocol:
invalid: 'Protocol is invalid' invalid: 'Protocol is invalid'

4
spec/epp/domain_spec.rb
View file

@ -398,7 +398,7 @@ describe 'EPP Domain', epp: true do
response = epp_request(xml, :xml) response = epp_request(xml, :xml)
expect(response[:results][0][:msg]).to eq('Algorithm is invalid') 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('Protocol is invalid')
@ -407,7 +407,7 @@ describe 'EPP Domain', epp: true do
expect(response[:results][2][:msg]).to eq('Flag is invalid') expect(response[:results][2][:msg]).to eq('Flag is invalid')
expect(response[:results][2][:value]).to eq('250') expect(response[:results][2][:value]).to eq('250')
expect(response[:results][3][:msg]).to eq('Algorithm is invalid') 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('Flag is invalid')