From 4197aa470f143b16c7d5f7c064455e6a9fd907c1 Mon Sep 17 00:00:00 2001
From: Martin Lensment <mlensment@gmail.com>
Date: Wed, 13 Aug 2014 15:40:42 +0300
Subject: [PATCH] Refactor another test

---
 spec/epp/domain_spec.rb                       | 10 +++++----
 .../domains/create_wo_tech_contact.xml        | 22 -------------------
 2 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 spec/epp/requests/domains/create_wo_tech_contact.xml

diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb
index a58f84550..e2e722d9a 100644
--- a/spec/epp/domain_spec.rb
+++ b/spec/epp/domain_spec.rb
@@ -140,7 +140,9 @@ describe 'EPP Domain', epp: true do
       }
 
       it 'creates a domain with contacts' do
-        response = epp_request('domains/create_wo_tech_contact.xml')
+        xml = domain_create_xml(contacts: [{contact_value: 'sh8013', contact_type: 'admin'}])
+
+        response = epp_request(xml, :xml)
         expect(response[:result_code]).to eq('1000')
         expect(response[:msg]).to eq('Command completed successfully')
         expect(response[:clTRID]).to eq('ABC-12345')
@@ -153,11 +155,11 @@ describe 'EPP Domain', epp: true do
       end
 
       it 'does not create a domain without admin contact' do
-        xml = domain_create_xml(contacts: [])
+        xml = domain_create_xml(contacts: [{contact_value: 'sh8013', contact_type: 'tech'}])
 
         response = epp_request(xml, :xml)
-        expect(response[:result_code]).to eq('2003')
-        expect(response[:msg]).to eq('Required parameter missing: contact')
+        expect(response[:result_code]).to eq('2306')
+        expect(response[:msg]).to eq('Admin contact is missing')
         expect(response[:clTRID]).to eq('ABC-12345')
 
         expect(Domain.count).to eq 0
diff --git a/spec/epp/requests/domains/create_wo_tech_contact.xml b/spec/epp/requests/domains/create_wo_tech_contact.xml
deleted file mode 100644
index d5b291ff2..000000000
--- a/spec/epp/requests/domains/create_wo_tech_contact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <create>
-      <domain:create
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.ee</domain:name>
-        <domain:period unit="y">1</domain:period>
-        <domain:ns>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-          <domain:hostObj>ns2.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:create>
-    </create>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>