From acb0c105615fb1487940e861cf7bf84b8b192312 Mon Sep 17 00:00:00 2001
From: Martin Lensment <mlensment@gmail.com>
Date: Wed, 8 Oct 2014 13:49:08 +0300
Subject: [PATCH] Show valid values on flags and protocol too

---
 app/models/dnskey.rb    | 12 ++++++------
 config/locales/en.yml   |  6 +++---
 spec/epp/domain_spec.rb | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/models/dnskey.rb b/app/models/dnskey.rb
index 87f44166f..304e2de8e 100644
--- a/app/models/dnskey.rb
+++ b/app/models/dnskey.rb
@@ -16,8 +16,8 @@ class Dnskey < ActiveRecord::Base
     {
       '2005' => [
         [:alg, :invalid, { value: { obj: 'alg', val: alg }, values: ALGORITHMS.join(', ') }],
-        [:protocol, :invalid, { value: { obj: 'protocol', val: protocol } }],
-        [:flags, :invalid, { value: { obj: 'flags', val: flags } }]
+        [:protocol, :invalid, { value: { obj: 'protocol', val: protocol }, values: PROTOCOLS.join(', ') }],
+        [:flags, :invalid, { value: { obj: 'flags', val: flags }, values: FLAGS.join(', ') }]
       ],
       '2302' => [
         [:public_key, :taken, { value: { obj: 'pubKye', val: public_key } }]
@@ -42,13 +42,13 @@ class Dnskey < ActiveRecord::Base
 
   def validate_protocol
     return if protocol.blank?
-    return if %w(3).include?(protocol.to_s)
-    errors.add(:protocol, :invalid)
+    return if PROTOCOLS.include?(protocol.to_s)
+    errors.add(:protocol, :invalid, values: PROTOCOLS.join(', '))
   end
 
   def validate_flags
     return if flags.blank?
-    return if %w(0 256 257).include?(flags.to_s)
-    errors.add(:flags, :invalid)
+    return if FLAGS.include?(flags.to_s)
+    errors.add(:flags, :invalid, values: FLAGS.join(', '))
   end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3cb52fb35..2c8062629 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -191,13 +191,13 @@ en:
         dnskey:
           attributes:
             alg:
-              invalid: 'Valid algorithms are %{values}'
+              invalid: 'Valid algorithms are: %{values}'
               blank: 'Algorithm is missing'
             protocol:
-              invalid: 'Protocol is invalid'
+              invalid: 'Valid protocols are: %{values}'
               blank: 'Protocol is missing'
             flags:
-              invalid: 'Flag is invalid'
+              invalid: 'Valid flags are: %{values}'
               blank: 'Flag is missing'
             public_key:
               taken: 'Public key already exists'
diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb
index 9974df120..13c55bbd5 100644
--- a/spec/epp/domain_spec.rb
+++ b/spec/epp/domain_spec.rb
@@ -398,24 +398,24 @@ describe 'EPP Domain', epp: true do
 
         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][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][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][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][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][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')
       end