From 49845d1d0b160d89c81ef0a0f151503d8688197a Mon Sep 17 00:00:00 2001 From: Martin Lensment Date: Tue, 28 Jul 2015 11:34:19 +0300 Subject: [PATCH] Fix rubocop #2803 --- app/models/depp/contact.rb | 2 +- spec/epp/contact_spec.rb | 34 +++++++++++++++++++++++++--------- spec/epp/domain_spec.rb | 4 +++- spec/epp/epp_helper_spec.rb | 2 -- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/app/models/depp/contact.rb b/app/models/depp/contact.rb index ceca67131..316d78818 100644 --- a/app/models/depp/contact.rb +++ b/app/models/depp/contact.rb @@ -208,7 +208,7 @@ module Depp authInfo: { pw: { value: password } } - }, + } }, extension_xml ) diff --git a/spec/epp/contact_spec.rb b/spec/epp/contact_spec.rb index 047a2a67e..dcd5e79db 100644 --- a/spec/epp/contact_spec.rb +++ b/spec/epp/contact_spec.rb @@ -60,7 +60,10 @@ describe 'EPP Contact', epp: true do it 'fails if request xml is missing' do response = epp_plain_request(@epp_xml.create) - response[:results][0][:msg].should == "Element '{https://epp.tld.ee/schema/contact-eis-1.0.xsd}create': Missing child element(s). Expected is one of ( {https://epp.tld.ee/schema/contact-eis-1.0.xsd}id, {https://epp.tld.ee/schema/contact-eis-1.0.xsd}postalInfo )." + response[:results][0][:msg].should == + "Element '{https://epp.tld.ee/schema/contact-eis-1.0.xsd}create': Missing child element(s). "\ + "Expected is one of ( {https://epp.tld.ee/schema/contact-eis-1.0.xsd}id, "\ + "{https://epp.tld.ee/schema/contact-eis-1.0.xsd}postalInfo )." response[:results][0][:result_code].should == '2001' end @@ -173,7 +176,9 @@ describe 'EPP Contact', epp: true do } } response = create_request({}, extension) - response[:msg].should == "Element '{https://epp.tld.ee/schema/eis-1.0.xsd}ident', attribute 'cc': [facet 'maxLength'] The value 'WRONG' has a length of '5'; this exceeds the allowed maximum length of '2'." + response[:msg].should == "Element '{https://epp.tld.ee/schema/eis-1.0.xsd}ident', "\ + "attribute 'cc': [facet 'maxLength'] The value 'WRONG' has a length of '5'; this exceeds "\ + "the allowed maximum length of '2'." response[:result_code].should == '2001' end @@ -185,7 +190,8 @@ describe 'EPP Contact', epp: true do } } response = create_request({}, extension) - response[:msg].should == "Element '{https://epp.tld.ee/schema/eis-1.0.xsd}ident': The attribute 'cc' is required but missing." + response[:msg].should == "Element '{https://epp.tld.ee/schema/eis-1.0.xsd}ident': The attribute "\ + "'cc' is required but missing." response[:result_code].should == '2001' end @@ -196,7 +202,8 @@ describe 'EPP Contact', epp: true do } } response = create_request({}, extension) - response[:msg].should == "Element '{https://epp.tld.ee/schema/eis-1.0.xsd}ident': The attribute 'type' is required but missing." + response[:msg].should == "Element '{https://epp.tld.ee/schema/eis-1.0.xsd}ident': The attribute "\ + "'type' is required but missing." response[:result_code].should == '2001' end @@ -309,7 +316,9 @@ describe 'EPP Contact', epp: true do it 'fails if request is invalid' do response = epp_plain_request(@epp_xml.update) - response[:results][0][:msg].should == "Element '{https://epp.tld.ee/schema/contact-eis-1.0.xsd}update': Missing child element(s). Expected is ( {https://epp.tld.ee/schema/contact-eis-1.0.xsd}id )." + response[:results][0][:msg].should == + "Element '{https://epp.tld.ee/schema/contact-eis-1.0.xsd}update': Missing child element(s). "\ + "Expected is ( {https://epp.tld.ee/schema/contact-eis-1.0.xsd}id )." end it 'returns error if obj doesnt exist' do @@ -398,7 +407,8 @@ describe 'EPP Contact', epp: true do }, {} ) - response[:msg].should == "Element '{https://epp.tld.ee/schema/contact-eis-1.0.xsd}id': This element is not expected." + response[:msg].should == "Element '{https://epp.tld.ee/schema/contact-eis-1.0.xsd}id': "\ + "This element is not expected." response[:result_code].should == '2001' @contact.reload.code.should == 'FIRST0:SH8013' @@ -719,7 +729,9 @@ describe 'EPP Contact', epp: true do it 'fails if request is invalid' do response = epp_plain_request(@epp_xml.delete) - response[:results][0][:msg].should == "Element '{https://epp.tld.ee/schema/contact-eis-1.0.xsd}delete': Missing child element(s). Expected is ( {https://epp.tld.ee/schema/contact-eis-1.0.xsd}id )." + response[:results][0][:msg].should == + "Element '{https://epp.tld.ee/schema/contact-eis-1.0.xsd}delete': Missing child element(s). "\ + "Expected is ( {https://epp.tld.ee/schema/contact-eis-1.0.xsd}id )." response[:results][0][:result_code].should == '2001' response[:results].count.should == 1 end @@ -814,7 +826,9 @@ describe 'EPP Contact', epp: true do it 'fails if request is invalid' do response = epp_plain_request(@epp_xml.check) - response[:results][0][:msg].should == "Element '{https://epp.tld.ee/schema/contact-eis-1.0.xsd}check': Missing child element(s). Expected is ( {https://epp.tld.ee/schema/contact-eis-1.0.xsd}id )." + response[:results][0][:msg].should == + "Element '{https://epp.tld.ee/schema/contact-eis-1.0.xsd}check': Missing child element(s). "\ + "Expected is ( {https://epp.tld.ee/schema/contact-eis-1.0.xsd}id )." response[:results][0][:result_code].should == '2001' response[:results].count.should == 1 end @@ -868,7 +882,9 @@ describe 'EPP Contact', epp: true do it 'fails if request invalid' do response = epp_plain_request(@epp_xml.info) - response[:results][0][:msg].should == "Element '{https://epp.tld.ee/schema/contact-eis-1.0.xsd}info': Missing child element(s). Expected is ( {https://epp.tld.ee/schema/contact-eis-1.0.xsd}id )." + response[:results][0][:msg].should == + "Element '{https://epp.tld.ee/schema/contact-eis-1.0.xsd}info': Missing child element(s). "\ + "Expected is ( {https://epp.tld.ee/schema/contact-eis-1.0.xsd}id )." response[:results][0][:result_code].should == '2001' response[:results].count.should == 1 end diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb index 2ae9b6908..0f5e4aff4 100644 --- a/spec/epp/domain_spec.rb +++ b/spec/epp/domain_spec.rb @@ -2757,7 +2757,9 @@ describe 'EPP Domain', epp: true do xml = domain_info_xml(name: { value: domain.name, attrs: { hosts: 'invalid' } }) response = epp_plain_request(xml) - response[:msg].should == "Element '{https://epp.tld.ee/schema/domain-eis-1.0.xsd}name', attribute 'hosts': [facet 'enumeration'] The value 'invalid' is not an element of the set {'all', 'del', 'none', 'sub'}." + response[:msg].should == "Element '{https://epp.tld.ee/schema/domain-eis-1.0.xsd}name', "\ + "attribute 'hosts': [facet 'enumeration'] The value 'invalid' is not an element of the "\ + "set {'all', 'del', 'none', 'sub'}." response[:result_code].should == '2001' xml = domain_info_xml(name: { value: domain.name, attrs: { hosts: 'sub' } }) diff --git a/spec/epp/epp_helper_spec.rb b/spec/epp/epp_helper_spec.rb index 006baf171..7247877fb 100644 --- a/spec/epp/epp_helper_spec.rb +++ b/spec/epp/epp_helper_spec.rb @@ -4,7 +4,6 @@ describe 'EPP Helper', epp: true do context 'in context of Domain' do before(:all) { @uniq_no = proc { @i ||= 0; @i += 1 } } - # rubocop: disable Metrics/LineLength it 'generates valid transfer xml' do dn = next_domain_name expected = Nokogiri::XML(' @@ -54,6 +53,5 @@ describe 'EPP Helper', epp: true do generated = Nokogiri::XML(xml).to_s.squish generated.should == expected end - # rubocop: enable Metrics/LineLength end end