From d66527ac80c9612766e0813723ece460c5b39ff0 Mon Sep 17 00:00:00 2001 From: Martin Lensment Date: Fri, 27 Jun 2014 16:16:32 +0300 Subject: [PATCH] Refactor --- app/views/epp/domains/check.xml.builder | 0 app/views/epp/domains/create.xml.builder | 3 ++- app/views/epp/sessions/greeting.xml.builder | 1 - app/views/epp/sessions/logout.xml.builder | 2 +- spec/epp/domain_spec.rb | 2 +- spec/epp/requests/{create_domain.xml => domains/create.xml} | 0 spec/epp/session_spec.rb | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 app/views/epp/domains/check.xml.builder rename spec/epp/requests/{create_domain.xml => domains/create.xml} (100%) diff --git a/app/views/epp/domains/check.xml.builder b/app/views/epp/domains/check.xml.builder new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/epp/domains/create.xml.builder b/app/views/epp/domains/create.xml.builder index 2c25c01b4..35bb10ff1 100644 --- a/app/views/epp/domains/create.xml.builder +++ b/app/views/epp/domains/create.xml.builder @@ -2,11 +2,12 @@ xml.instruct! xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation' => 'urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd') do xml.response do xml.result('code' => '1000') do - xml.msg('Command completed successfully') + xml.msg 'Command completed successfully' end end xml.trID do xml.clTRID params[:clTRID] + xml.svTRID @svTRID end end diff --git a/app/views/epp/sessions/greeting.xml.builder b/app/views/epp/sessions/greeting.xml.builder index 50b48ef70..033549ad3 100644 --- a/app/views/epp/sessions/greeting.xml.builder +++ b/app/views/epp/sessions/greeting.xml.builder @@ -6,7 +6,6 @@ xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www. xml.svcMenu do xml.version '1.0' xml.lang 'en' - xml.lang 'cs' xml.objURI 'http://www.nic.cz/xml/epp/contact-1.6' xml.objURI 'http://www.nic.cz/xml/epp/domain-1.4' xml.objURI 'http://www.nic.cz/xml/epp/nsset-1.2' diff --git a/app/views/epp/sessions/logout.xml.builder b/app/views/epp/sessions/logout.xml.builder index 7a851129b..c3a506b0b 100644 --- a/app/views/epp/sessions/logout.xml.builder +++ b/app/views/epp/sessions/logout.xml.builder @@ -2,7 +2,7 @@ xml.instruct! xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation' => 'urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd') do xml.response do xml.result('code' => '1500') do - xml.msg('Command completed successfully; ending session', 'lang' => 'en') + xml.msg 'Command completed successfully; ending session' end end diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb index 0cc64c91e..d0c141335 100644 --- a/spec/epp/domain_spec.rb +++ b/spec/epp/domain_spec.rb @@ -7,7 +7,7 @@ describe 'EPP Domain', epp: true do before(:each) { Fabricate(:epp_user) } it 'creates a domain' do - response = epp_request('create_domain.xml') + response = epp_request('domains/create.xml') expect(response[:result_code]).to eq('1000') expect(response[:msg]).to eq('Command completed successfully') expect(response[:clTRID]).to eq('dpbx005#10-01-29at19:21:47') diff --git a/spec/epp/requests/create_domain.xml b/spec/epp/requests/domains/create.xml similarity index 100% rename from spec/epp/requests/create_domain.xml rename to spec/epp/requests/domains/create.xml diff --git a/spec/epp/session_spec.rb b/spec/epp/session_spec.rb index 045a8fb13..d7d7cd6f6 100644 --- a/spec/epp/session_spec.rb +++ b/spec/epp/session_spec.rb @@ -28,7 +28,7 @@ describe 'EPP Session', epp: true do end it 'prohibits further actions unless logged in' do - response = epp_plain_request('create_domain.xml') + response = epp_plain_request('domains/create.xml') expect(response[:result_code]).to eq('2002') expect(response[:msg]).to eq('You need to login first.') expect(response[:clTRID]).to eq('dpbx005#10-01-29at19:21:47')