From 7c1c065ea4e672d49b908b4e45bf859ca39a1798 Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Fri, 10 Jun 2016 12:14:05 +0300 Subject: [PATCH] Strory#110308584 - hostname error responds in xml way of array --- app/views/epp/error.xml.builder | 8 +++++++- spec/epp/domain_spec.rb | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/views/epp/error.xml.builder b/app/views/epp/error.xml.builder index 796856f4c..3f2aa37f0 100644 --- a/app/views/epp/error.xml.builder +++ b/app/views/epp/error.xml.builder @@ -5,7 +5,13 @@ xml.epp_head do xml.msg(x[:msg], 'lang' => 'en') xml.value('xmlns:obj' => 'urn:ietf:params:xml:ns:obj') do - xml.tag!("obj:#{x[:value][:obj]}", x[:value][:val]) + if (val = x[:value][:val]).respond_to?(:each) + val.each do |el| + xml.tag!("obj:#{x[:value][:obj]}", el) + end + else + xml.tag!("obj:#{x[:value][:obj]}", val) + end end if x[:value] x[:ext_values].each do |y| diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb index c60cbc189..0d5f1e83d 100644 --- a/spec/epp/domain_spec.rb +++ b/spec/epp/domain_spec.rb @@ -134,7 +134,7 @@ describe 'EPP Domain', epp: true do key = d.dnskeys.last - key.ds_alg.should == 3 + key.ds_alg.should == 5 key.ds_key_tag.should_not be_blank key.ds_digest_type.should == Setting.ds_algorithm @@ -394,7 +394,7 @@ describe 'EPP Domain', epp: true do response = epp_plain_request(domain_create_with_invalid_ns_ip_xml) response[:results][0][:result_code].should == '2005' response[:results][0][:msg].should == 'IPv4 is invalid [ipv4]' - response[:results][0][:value].should == ['192.0.2.2.invalid'] + response[:results][0][:value].should == '192.0.2.2.invalid' response[:results][1][:result_code].should == '2005' response[:results][1][:msg].should == 'IPv6 is invalid [ipv6]' response[:results][1][:value].should == 'INVALID_IPV6'