From a846a51444506a7ac1d5688aa0c0e7450e206333 Mon Sep 17 00:00:00 2001
From: Martin Lensment <mlensment@gmail.com>
Date: Wed, 13 Aug 2014 16:15:04 +0300
Subject: [PATCH] Refactor domain check tests

---
 spec/epp/domain_spec.rb                        | 16 ++++++++++------
 spec/epp/requests/domains/check.xml            |  2 +-
 spec/epp/requests/domains/check_multiple.xml   | 14 --------------
 .../domains/check_multiple_with_invalid.xml    | 13 -------------
 spec/support/epp.rb                            | 18 ++++++++++++++++++
 5 files changed, 29 insertions(+), 34 deletions(-)
 delete mode 100644 spec/epp/requests/domains/check_multiple.xml
 delete mode 100644 spec/epp/requests/domains/check_multiple_with_invalid.xml

diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb
index 27fcbbd88..abbcba2e4 100644
--- a/spec/epp/domain_spec.rb
+++ b/spec/epp/domain_spec.rb
@@ -9,7 +9,7 @@ describe 'EPP Domain', epp: true do
     it 'returns error if contact does not exists' do
       Fabricate(:contact, code: 'jd1234')
 
-      response = epp_request(domain_create_xml, :xml)
+      response = epp_request('domains/create.xml')
       expect(response[:results][0][:result_code]).to eq('2303')
       expect(response[:results][0][:msg]).to eq('Contact was not found')
       expect(response[:results][0][:value]).to eq('sh8013')
@@ -202,23 +202,25 @@ describe 'EPP Domain', epp: true do
       expect(response[:msg]).to eq('Command completed successfully')
 
       domain = response[:parsed].css('resData chkData cd name').first
-      expect(domain.text).to eq('one.ee')
+      expect(domain.text).to eq('example.ee')
       expect(domain[:avail]).to eq('1')
 
-      Fabricate(:domain, name: 'one.ee')
+      Fabricate(:domain, name: 'example.ee')
 
       response = epp_request('domains/check.xml')
       domain = response[:parsed].css('resData chkData cd').first
       name = domain.css('name').first
       reason = domain.css('reason').first
 
-      expect(name.text).to eq('one.ee')
+      expect(name.text).to eq('example.ee')
       expect(name[:avail]).to eq('0')
       expect(reason.text).to eq('in use') #confirm this with current API
     end
 
     it 'checks multiple domains' do
-      response = epp_request('domains/check_multiple.xml')
+      xml = domain_check_xml(names: ['one.ee', 'two.ee', 'three.ee'])
+
+      response = epp_request(xml, :xml)
       expect(response[:result_code]).to eq('1000')
       expect(response[:msg]).to eq('Command completed successfully')
 
@@ -232,7 +234,9 @@ describe 'EPP Domain', epp: true do
     end
 
     it 'checks invalid format domain' do
-      response = epp_request('domains/check_multiple_with_invalid.xml')
+      xml = domain_check_xml(names: ['one.ee', 'notcorrectdomain'])
+
+      response = epp_request(xml, :xml)
       expect(response[:result_code]).to eq('1000')
       expect(response[:msg]).to eq('Command completed successfully')
 
diff --git a/spec/epp/requests/domains/check.xml b/spec/epp/requests/domains/check.xml
index bc6fa17e3..b55a4b129 100644
--- a/spec/epp/requests/domains/check.xml
+++ b/spec/epp/requests/domains/check.xml
@@ -4,7 +4,7 @@
     <check>
       <domain:check
        xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>one.ee</domain:name>
+        <domain:name>example.ee</domain:name>
       </domain:check>
     </check>
     <clTRID>ABC-12345</clTRID>
diff --git a/spec/epp/requests/domains/check_multiple.xml b/spec/epp/requests/domains/check_multiple.xml
deleted file mode 100644
index 5791da8e4..000000000
--- a/spec/epp/requests/domains/check_multiple.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <check>
-      <domain:check
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>one.ee</domain:name>
-        <domain:name>two.ee</domain:name>
-        <domain:name>three.ee</domain:name>
-      </domain:check>
-    </check>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/spec/epp/requests/domains/check_multiple_with_invalid.xml b/spec/epp/requests/domains/check_multiple_with_invalid.xml
deleted file mode 100644
index b7f086738..000000000
--- a/spec/epp/requests/domains/check_multiple_with_invalid.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <check>
-      <domain:check
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>one.ee</domain:name>
-        <domain:name>notcorrectdomain</domain:name>
-      </domain:check>
-    </check>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/spec/support/epp.rb b/spec/support/epp.rb
index b044bd4ac..e834313db 100644
--- a/spec/support/epp.rb
+++ b/spec/support/epp.rb
@@ -107,6 +107,24 @@ module Epp
     end
   end
 
+  def domain_check_xml(xml_params={})
+    xml_params[:names] = xml_params[:names] || ['example.ee']
+    xml = Builder::XmlMarkup.new
+
+    xml.instruct!(:xml, :standalone => 'no')
+    xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0') do
+      xml.command do
+        xml.check do
+          xml.tag!('domain:check', 'xmlns:domain' => 'urn:ietf:params:xml:ns:domain-1.0') do
+            xml_params[:names].each do |x|
+              xml.tag!('domain:name', (x || 'example.ee'))
+            end if xml_params[:names].any?
+          end
+        end
+        xml.clTRID 'ABC-12345'
+      end
+    end
+  end
 end
 
 RSpec.configure do |c|