epics 2.10.0 → 3.0.0.rc1

data/spec/orders/fdl_spec.rb

@@ -1,39 +1,123 @@
 RSpec.describe Epics::FDL do
-  let(:client) { Epics::Client.new( File.open(File.join( File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')), 'secret' , 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS') }
+  let(:client) { Epics::Client.new( File.open(File.join( File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')), 'secret' , 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS', version:) }
   let(:file_format) { 'camt.xxx.cfonb120.stm.Oby' }
 
   context 'with file_format' do
     subject(:order) { described_class.new(client, file_format: file_format) }
 
+    include_examples '#to_xml', versions: [Epics::Keyring::VERSION_24, Epics::Keyring::VERSION_25]
+    describe '#to_xml H005' do
+      let(:version) { Epics::Keyring::VERSION_30 }
+      it('raises VersionSupportError') { expect { subject.to_xml }.to raise_error(Epics::VersionSupportError) }
+    end
+    include_examples '#to_receipt_xml', versions: [Epics::Keyring::VERSION_24, Epics::Keyring::VERSION_25]
+
     describe '#to_xml' do
-      specify { expect(order.to_xml).to be_a_valid_ebics_doc }
+      let(:version) { Epics::Keyring::VERSION_25 }
 
       it 'does includes a date range as standard order parameter' do
         expect(order.to_xml).to include('<FDLOrderParams><FileFormat>camt.xxx.cfonb120.stm.Oby</FileFormat></FDLOrderParams>')
       end
     end
 
-    describe '#to_receipt_xml' do
-      before { order.transaction_id = SecureRandom.hex(16) }
+    describe 'H004 request structure' do
+      let(:version) { Epics::Keyring::VERSION_25 }
+      let(:xml) { Nokogiri::XML(subject.to_xml) }
+      let(:ns) { { 'e' => 'urn:org:ebics:H004' } }
+
+      include_examples 'a valid ebicsRequest download with FDLOrderParams',
+        order_type: 'FDL', file_format: 'camt.xxx.cfonb120.stm.Oby'
+    end
+
+    describe 'H004 receipt structure' do
+      let(:version) { Epics::Keyring::VERSION_25 }
+      let(:xml) do
+        subject.transaction_id = SecureRandom.hex(16)
+        Nokogiri::XML(subject.to_receipt_xml)
+      end
+      let(:ns) { { 'e' => 'urn:org:ebics:H004' } }
 
-      specify { expect(order.to_receipt_xml).to be_a_valid_ebics_doc }
+      include_examples 'a valid ebicsRequest receipt'
+    end
+
+    describe 'H003 request structure' do
+      let(:version) { Epics::Keyring::VERSION_24 }
+      let(:xml) { Nokogiri::XML(subject.to_xml) }
+      let(:ns) { { 'e' => 'http://www.ebics.org/H003' } }
+
+      include_examples 'a valid ebicsRequest download with FDLOrderParams',
+        order_type: 'FDL', file_format: 'camt.xxx.cfonb120.stm.Oby', ebics_version: 'H003'
+    end
+
+    describe 'H003 receipt structure' do
+      let(:version) { Epics::Keyring::VERSION_24 }
+      let(:xml) do
+        subject.transaction_id = SecureRandom.hex(16)
+        Nokogiri::XML(subject.to_receipt_xml)
+      end
+      let(:ns) { { 'e' => 'http://www.ebics.org/H003' } }
+
+      include_examples 'a valid ebicsRequest receipt', ebics_version: 'H003'
     end
 
     context 'with DateRange' do
       subject(:order) { described_class.new(client, file_format: file_format, from: Date.new(2024, 1, 1), to: Date.new(2024, 1, 2)) }
 
+      include_examples '#to_xml', versions: [Epics::Keyring::VERSION_24, Epics::Keyring::VERSION_25]
+      describe '#to_xml H005' do
+      let(:version) { Epics::Keyring::VERSION_30 }
+      it('raises VersionSupportError') { expect { subject.to_xml }.to raise_error(Epics::VersionSupportError) }
+    end
+      include_examples '#to_receipt_xml', versions: [Epics::Keyring::VERSION_24, Epics::Keyring::VERSION_25]
+  
       describe '#to_xml' do
-        specify { expect(order.to_xml).to be_a_valid_ebics_doc }
+        let(:version) { Epics::Keyring::VERSION_25 }
 
         it 'does includes a date range as optional order parameter' do
           expect(order.to_xml).to include('<FDLOrderParams><DateRange><Start>2024-01-01</Start><End>2024-01-02</End></DateRange><FileFormat>camt.xxx.cfonb120.stm.Oby</FileFormat></FDLOrderParams>')
         end
       end
 
-      describe '#to_receipt_xml' do
-        before { order.transaction_id = SecureRandom.hex(16) }
+      describe 'H004 request structure' do
+        let(:version) { Epics::Keyring::VERSION_25 }
+        let(:xml) { Nokogiri::XML(subject.to_xml) }
+        let(:ns) { { 'e' => 'urn:org:ebics:H004' } }
+
+        include_examples 'a valid ebicsRequest download with FDLOrderParams and date range',
+          order_type: 'FDL', file_format: 'camt.xxx.cfonb120.stm.Oby',
+          from: '2024-01-01', to: '2024-01-02'
+      end
+
+      describe 'H004 receipt structure' do
+        let(:version) { Epics::Keyring::VERSION_25 }
+        let(:xml) do
+          subject.transaction_id = SecureRandom.hex(16)
+          Nokogiri::XML(subject.to_receipt_xml)
+        end
+        let(:ns) { { 'e' => 'urn:org:ebics:H004' } }
+
+        include_examples 'a valid ebicsRequest receipt'
+      end
+
+      describe 'H003 request structure' do
+        let(:version) { Epics::Keyring::VERSION_24 }
+        let(:xml) { Nokogiri::XML(subject.to_xml) }
+        let(:ns) { { 'e' => 'http://www.ebics.org/H003' } }
 
-        specify { expect(order.to_receipt_xml).to be_a_valid_ebics_doc }
+        include_examples 'a valid ebicsRequest download with FDLOrderParams and date range',
+          order_type: 'FDL', file_format: 'camt.xxx.cfonb120.stm.Oby',
+          from: '2024-01-01', to: '2024-01-02', ebics_version: 'H003'
+      end
+
+      describe 'H003 receipt structure' do
+        let(:version) { Epics::Keyring::VERSION_24 }
+        let(:xml) do
+          subject.transaction_id = SecureRandom.hex(16)
+          Nokogiri::XML(subject.to_receipt_xml)
+        end
+        let(:ns) { { 'e' => 'http://www.ebics.org/H003' } }
+
+        include_examples 'a valid ebicsRequest receipt', ebics_version: 'H003'
       end
     end
   end
@@ -41,18 +125,64 @@ RSpec.describe Epics::FDL do
   context 'without file_format' do
     subject(:order) { described_class.new(client) }
 
+    describe 'order attributes' do
+      let(:version) { Epics::Keyring::VERSION_25 }
+
+      it { expect(subject.to_xml).to include('<OrderAttribute>DZHNN</OrderAttribute>') }
+      it { expect(subject.to_xml).to include('<OrderType>FDL</OrderType>') }
+    end
+
+    include_examples '#to_xml', versions: [Epics::Keyring::VERSION_24, Epics::Keyring::VERSION_25]
+    describe '#to_xml H005' do
+      let(:version) { Epics::Keyring::VERSION_30 }
+      it('raises VersionSupportError') { expect { subject.to_xml }.to raise_error(Epics::VersionSupportError) }
+    end
+    include_examples '#to_receipt_xml', versions: [Epics::Keyring::VERSION_24, Epics::Keyring::VERSION_25]
+
     describe '#to_xml' do
-      specify { expect(order.to_xml).to be_a_valid_ebics_doc }
+      let(:version) { Epics::Keyring::VERSION_25 }
 
       it 'does not include a standard order parameter' do
         expect(order.to_xml).to include('<FDLOrderParams><FileFormat/></FDLOrderParams>')
       end
     end
 
-    describe '#to_receipt_xml' do
-      before { order.transaction_id = SecureRandom.hex(16) }
+    describe 'H004 request structure' do
+      let(:version) { Epics::Keyring::VERSION_25 }
+      let(:xml) { Nokogiri::XML(subject.to_xml) }
+      let(:ns) { { 'e' => 'urn:org:ebics:H004' } }
+
+      include_examples 'a valid ebicsRequest download', order_type: 'FDL'
+    end
+
+    describe 'H004 receipt structure' do
+      let(:version) { Epics::Keyring::VERSION_25 }
+      let(:xml) do
+        subject.transaction_id = SecureRandom.hex(16)
+        Nokogiri::XML(subject.to_receipt_xml)
+      end
+      let(:ns) { { 'e' => 'urn:org:ebics:H004' } }
+
+      include_examples 'a valid ebicsRequest receipt'
+    end
+
+    describe 'H003 request structure' do
+      let(:version) { Epics::Keyring::VERSION_24 }
+      let(:xml) { Nokogiri::XML(subject.to_xml) }
+      let(:ns) { { 'e' => 'http://www.ebics.org/H003' } }
+
+      include_examples 'a valid ebicsRequest download', order_type: 'FDL', ebics_version: 'H003'
+    end
+
+    describe 'H003 receipt structure' do
+      let(:version) { Epics::Keyring::VERSION_24 }
+      let(:xml) do
+        subject.transaction_id = SecureRandom.hex(16)
+        Nokogiri::XML(subject.to_receipt_xml)
+      end
+      let(:ns) { { 'e' => 'http://www.ebics.org/H003' } }
 
-      specify { expect(order.to_receipt_xml).to be_a_valid_ebics_doc }
+      include_examples 'a valid ebicsRequest receipt', ebics_version: 'H003'
     end
   end
 end

data/spec/orders/ful_spec.rb

@@ -0,0 +1,63 @@
+RSpec.describe Epics::FUL do
+  let(:client) { Epics::Client.new( File.open(File.join( File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')), 'secret' , 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS', version:) }
+  let(:document) { File.read( File.join( File.dirname(__FILE__), '..', 'fixtures', 'xml', 'cd1.xml') ) }
+
+  subject { described_class.new(client, document, file_format: 'pain.001.001.02') }
+
+  describe 'order attributes' do
+    let(:version) { Epics::Keyring::VERSION_25 }
+
+    it { expect(subject.to_xml).to include('<OrderAttribute>DZHNN</OrderAttribute>') }
+    it { expect(subject.to_xml).to include('<OrderType>FUL</OrderType>') }
+    it { expect(subject.to_xml).to include('<FileFormat>pain.001.001.02</FileFormat>') }
+  end
+
+  include_examples '#to_xml', versions: [Epics::Keyring::VERSION_24, Epics::Keyring::VERSION_25]
+  include_examples '#to_transfer_xml', versions: [Epics::Keyring::VERSION_24, Epics::Keyring::VERSION_25]
+
+  describe '#to_xml H005' do
+    let(:version) { Epics::Keyring::VERSION_30 }
+    it('raises VersionSupportError') { expect { subject.to_xml }.to raise_error(Epics::VersionSupportError) }
+  end
+
+
+  describe 'H004 request structure' do
+    let(:version) { Epics::Keyring::VERSION_25 }
+    let(:xml) { Nokogiri::XML(subject.to_xml) }
+    let(:ns) { { 'e' => 'urn:org:ebics:H004' } }
+
+    include_examples 'a valid ebicsRequest upload with FULOrderParams',
+      order_type: 'FUL', order_attribute: 'DZHNN', file_format: 'pain.001.001.02'
+  end
+
+  describe 'H004 transfer structure' do
+    let(:version) { Epics::Keyring::VERSION_25 }
+    let(:xml) do
+      subject.transaction_id = SecureRandom.hex(16)
+      Nokogiri::XML(subject.to_transfer_xml)
+    end
+    let(:ns) { { 'e' => 'urn:org:ebics:H004' } }
+
+    include_examples 'a valid ebicsRequest transfer'
+  end
+
+  describe 'H003 request structure' do
+    let(:version) { Epics::Keyring::VERSION_24 }
+    let(:xml) { Nokogiri::XML(subject.to_xml) }
+    let(:ns) { { 'e' => 'http://www.ebics.org/H003' } }
+
+    include_examples 'a valid ebicsRequest upload with FULOrderParams',
+      order_type: 'FUL', order_attribute: 'DZHNN', file_format: 'pain.001.001.02', ebics_version: 'H003'
+  end
+
+  describe 'H003 transfer structure' do
+    let(:version) { Epics::Keyring::VERSION_24 }
+    let(:xml) do
+      subject.transaction_id = SecureRandom.hex(16)
+      Nokogiri::XML(subject.to_transfer_xml)
+    end
+    let(:ns) { { 'e' => 'http://www.ebics.org/H003' } }
+
+    include_examples 'a valid ebicsRequest transfer', ebics_version: 'H003'
+  end
+end

data/spec/orders/haa_spec.rb

@@ -1,33 +1,139 @@
 RSpec.describe Epics::HAA do
-
-  let(:client) { Epics::Client.new( File.open(File.join( File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')), 'secret' , 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS') }
+  let(:client) { Epics::Client.new( File.open(File.join( File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')), 'secret' , 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS', version:) }
 
   subject { described_class.new(client) }
 
-  before do
-    allow(subject).to receive(:nonce) { "95149241ead8ae7dbb72cabe966bf0e3" }
-    allow(subject).to receive(:timestamp) { "2017-10-17T19:56:33Z" }
+  before { allow(SecureRandom).to receive(:hex).with(16).and_return('95149241ead8ae7dbb72cabe966bf0e3') }
+  before { allow(Time).to receive(:now).and_return(Time.parse('2017-10-17T19:56:33Z')) }
+
+  describe 'order attributes' do
+    let(:version) { Epics::Keyring::VERSION_25 }
+
+    it { expect(subject.to_xml).to include('<OrderAttribute>DZHNN</OrderAttribute>') }
+    it { expect(subject.to_xml).to include('<OrderType>HAA</OrderType>') }
   end
 
+  include_examples '#to_xml'
+  include_examples '#to_receipt_xml'
+
   describe '#to_xml' do
-    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+    let(:version) { Epics::Keyring::VERSION_25 }
 
     describe 'validate against fixture' do
-      let(:signature_order_data) { Nokogiri::XML(File.read(File.join( File.dirname(__FILE__), '..', 'fixtures', 'xml', 'haa.xml'))) }
+      let(:signature_order_data) {
+        doc = Nokogiri::XML(File.read(File.join( File.dirname(__FILE__), '..', 'fixtures', 'xml', 'haa.xml')))
+        doc.xpath('//text()').each { |node| node.content = '' if node.text =~ /\A\s+\z/m }
+        doc
+      }
 
-      it "will match exactly" do
+      it 'will match exactly' do
         expect(Nokogiri::XML(subject.to_xml)).to be_equivalent_to(signature_order_data)
       end
     end
   end
 
   describe '#to_receipt_xml' do
+    let(:version) { Epics::Keyring::VERSION_25 }
+
     describe 'validate against fixture' do
       let(:signature_order_data) { Nokogiri::XML(File.read(File.join( File.dirname(__FILE__), '..', 'fixtures', 'xml', 'haa_receipt.xml'))) }
 
-      it "will match exactly" do
+      it 'will match exactly' do
         expect(Nokogiri::XML(subject.to_receipt_xml)).to be_equivalent_to(signature_order_data)
       end
     end
   end
+
+  describe 'H004 request structure' do
+    let(:version) { Epics::Keyring::VERSION_25 }
+    let(:xml) { Nokogiri::XML(subject.to_xml) }
+    let(:ns) { { 'e' => 'urn:org:ebics:H004' } }
+
+    include_examples 'a valid ebicsRequest download', order_type: 'HAA'
+  end
+
+  describe 'H004 receipt structure' do
+    let(:version) { Epics::Keyring::VERSION_25 }
+    let(:xml) do
+      subject.transaction_id = SecureRandom.hex(16)
+      Nokogiri::XML(subject.to_receipt_xml)
+    end
+    let(:ns) { { 'e' => 'urn:org:ebics:H004' } }
+
+    include_examples 'a valid ebicsRequest receipt'
+  end
+
+  describe 'H003 request structure' do
+    let(:version) { Epics::Keyring::VERSION_24 }
+    let(:xml) { Nokogiri::XML(subject.to_xml) }
+    let(:ns) { { 'e' => 'http://www.ebics.org/H003' } }
+
+    include_examples 'a valid ebicsRequest download', order_type: 'HAA', ebics_version: 'H003'
+  end
+
+  describe 'H003 receipt structure' do
+    let(:version) { Epics::Keyring::VERSION_24 }
+    let(:xml) do
+      subject.transaction_id = SecureRandom.hex(16)
+      Nokogiri::XML(subject.to_receipt_xml)
+    end
+    let(:ns) { { 'e' => 'http://www.ebics.org/H003' } }
+
+    include_examples 'a valid ebicsRequest receipt', ebics_version: 'H003'
+  end
+
+  describe 'H005 receipt structure' do
+    let(:version) { Epics::Keyring::VERSION_30 }
+    let(:xml) do
+      subject.transaction_id = SecureRandom.hex(16)
+      Nokogiri::XML(subject.to_receipt_xml)
+    end
+    let(:ns) { { 'e' => 'urn:org:ebics:H005' } }
+
+    include_examples 'a valid ebicsRequest receipt', ebics_version: 'H005'
+  end
+
+  describe 'H005 request structure validation' do
+    let(:version) { Epics::Keyring::VERSION_30 }
+    let(:xml) { Nokogiri::XML(subject.to_xml) }
+    let(:ns) { { 'e' => 'urn:org:ebics:H005' } }
+
+    it 'has ebicsRequest root with H005 namespace and Version' do
+      root = xml.root
+      expect(root.name).to eq('ebicsRequest')
+      expect(root.namespace.href).to eq('urn:org:ebics:H005')
+      expect(root['Version']).to eq('H005')
+      expect(root['Revision']).to eq('1')
+    end
+
+    it 'has header with authenticate=true' do
+      header = xml.at_xpath('//e:header', ns)
+      expect(header).not_to be_nil
+      expect(header['authenticate']).to eq('true')
+    end
+
+    it 'has AdminOrderType HAA' do
+      expect(xml.at_xpath('//e:header/e:static/e:OrderDetails/e:AdminOrderType', ns).text).to eq('HAA')
+    end
+
+    it 'does not have OrderType or OrderAttribute' do
+      expect(xml.at_xpath('//e:header/e:static/e:OrderDetails/e:OrderType', ns)).to be_nil
+      expect(xml.at_xpath('//e:header/e:static/e:OrderDetails/e:OrderAttribute', ns)).to be_nil
+    end
+
+    it 'has PartnerID and UserID' do
+      expect(xml.at_xpath('//e:header/e:static/e:PartnerID', ns)).not_to be_nil
+      expect(xml.at_xpath('//e:header/e:static/e:UserID', ns)).not_to be_nil
+    end
+
+    it 'has AuthSignature element' do
+      expect(xml.at_xpath('//e:AuthSignature', ns)).not_to be_nil
+    end
+
+    it 'has an empty body (no DataTransfer)' do
+      body = xml.at_xpath('//e:body', ns)
+      expect(body).not_to be_nil
+      expect(body.at_xpath('e:DataTransfer', ns)).to be_nil
+    end
+  end
 end

data/spec/orders/hac_spec.rb

@@ -1,39 +1,118 @@
 RSpec.describe Epics::HAC do
-  let(:client) { Epics::Client.new( File.open(File.join( File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')), 'secret' , 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS') }
+  let(:client) { Epics::Client.new( File.open(File.join( File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')), 'secret' , 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS', version:) }
 
   context 'with date range' do
-    subject(:order) { described_class.new(client, from: "2014-09-01", to: "2014-09-30") }
+    subject(:order) { described_class.new(client, from: Date.parse('2014-09-01'), to: Date.parse('2014-09-30')) }
+
+    include_examples '#to_xml'
+    include_examples '#to_receipt_xml'
 
     describe '#to_xml' do
-      specify { expect(order.to_xml).to be_a_valid_ebics_doc }
+      let(:version) { Epics::Keyring::VERSION_25 }
 
       it 'does includes a date range as standard order parameter' do
         expect(order.to_xml).to include('<StandardOrderParams><DateRange><Start>2014-09-01</Start><End>2014-09-30</End></DateRange></StandardOrderParams>')
       end
     end
 
-    describe '#to_receipt_xml' do
-      before { order.transaction_id = SecureRandom.hex(16) }
+    describe 'H004 request structure' do
+      let(:version) { Epics::Keyring::VERSION_25 }
+      let(:xml) { Nokogiri::XML(subject.to_xml) }
+      let(:ns) { { 'e' => 'urn:org:ebics:H004' } }
+
+      include_examples 'a valid ebicsRequest download with date range',
+        order_type: 'HAC', from: '2014-09-01', to: '2014-09-30'
+    end
+
+    describe 'H004 receipt structure' do
+      let(:version) { Epics::Keyring::VERSION_25 }
+      let(:xml) do
+        subject.transaction_id = SecureRandom.hex(16)
+        Nokogiri::XML(subject.to_receipt_xml)
+      end
+      let(:ns) { { 'e' => 'urn:org:ebics:H004' } }
+
+      include_examples 'a valid ebicsRequest receipt'
+    end
+
+    describe 'H003 request structure' do
+      let(:version) { Epics::Keyring::VERSION_24 }
+      let(:xml) { Nokogiri::XML(subject.to_xml) }
+      let(:ns) { { 'e' => 'http://www.ebics.org/H003' } }
 
-      specify { expect(order.to_receipt_xml).to be_a_valid_ebics_doc }
+      include_examples 'a valid ebicsRequest download with date range',
+        order_type: 'HAC', from: '2014-09-01', to: '2014-09-30', ebics_version: 'H003'
+    end
+
+    describe 'H003 receipt structure' do
+      let(:version) { Epics::Keyring::VERSION_24 }
+      let(:xml) do
+        subject.transaction_id = SecureRandom.hex(16)
+        Nokogiri::XML(subject.to_receipt_xml)
+      end
+      let(:ns) { { 'e' => 'http://www.ebics.org/H003' } }
+
+      include_examples 'a valid ebicsRequest receipt', ebics_version: 'H003'
     end
   end
 
   context 'without date range' do
     subject(:order) { described_class.new(client) }
 
+    describe 'order attributes' do
+      let(:version) { Epics::Keyring::VERSION_25 }
+
+      it { expect(subject.to_xml).to include('<OrderAttribute>DZHNN</OrderAttribute>') }
+      it { expect(subject.to_xml).to include('<OrderType>HAC</OrderType>') }
+    end
+
+    include_examples '#to_xml'
+    include_examples '#to_receipt_xml'
+
     describe '#to_xml' do
-      specify { expect(order.to_xml).to be_a_valid_ebics_doc }
+      let(:version) { Epics::Keyring::VERSION_25 }
 
       it 'does not include a standard order parameter' do
         expect(order.to_xml).to include('<StandardOrderParams/>')
       end
     end
 
-    describe '#to_receipt_xml' do
-      before { order.transaction_id = SecureRandom.hex(16) }
+    describe 'H004 request structure' do
+      let(:version) { Epics::Keyring::VERSION_25 }
+      let(:xml) { Nokogiri::XML(subject.to_xml) }
+      let(:ns) { { 'e' => 'urn:org:ebics:H004' } }
+
+      include_examples 'a valid ebicsRequest download', order_type: 'HAC'
+    end
+
+    describe 'H004 receipt structure' do
+      let(:version) { Epics::Keyring::VERSION_25 }
+      let(:xml) do
+        subject.transaction_id = SecureRandom.hex(16)
+        Nokogiri::XML(subject.to_receipt_xml)
+      end
+      let(:ns) { { 'e' => 'urn:org:ebics:H004' } }
+
+      include_examples 'a valid ebicsRequest receipt'
+    end
+
+    describe 'H003 request structure' do
+      let(:version) { Epics::Keyring::VERSION_24 }
+      let(:xml) { Nokogiri::XML(subject.to_xml) }
+      let(:ns) { { 'e' => 'http://www.ebics.org/H003' } }
+
+      include_examples 'a valid ebicsRequest download', order_type: 'HAC', ebics_version: 'H003'
+    end
+
+    describe 'H003 receipt structure' do
+      let(:version) { Epics::Keyring::VERSION_24 }
+      let(:xml) do
+        subject.transaction_id = SecureRandom.hex(16)
+        Nokogiri::XML(subject.to_receipt_xml)
+      end
+      let(:ns) { { 'e' => 'http://www.ebics.org/H003' } }
 
-      specify { expect(order.to_receipt_xml).to be_a_valid_ebics_doc }
+      include_examples 'a valid ebicsRequest receipt', ebics_version: 'H003'
     end
   end
 end

data/spec/orders/hev_spec.rb

@@ -1,14 +1,9 @@
 RSpec.describe Epics::HEV do
-
   let(:client) { Epics::Client.new( File.open(File.join( File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')), 'secret' , 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS') }
 
-  let(:xsd) { Nokogiri::XML::Schema(File.open( File.join( File.dirname(__FILE__), '..', 'xsd', 'ebics_hev.xsd') )) }
-  let(:validator) { xsd.valid?(Nokogiri::XML(subject.to_xml)) }
-
   subject { described_class.new(client) }
 
   describe '#to_xml' do
-    specify { expect(validator).to be_truthy }
+    specify { expect(subject.to_xml).to be_a_valid_ebics_doc('H000') }
   end
-
 end

data/spec/orders/hia_spec.rb

@@ -1,16 +1,23 @@
 RSpec.describe Epics::HIA do
-  let(:client) { Epics::Client.new(key, 'secret', 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS') }
-  let(:key) { File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')) }
+  let(:client) { Epics::Client.new( File.open(File.join( File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')), 'secret' , 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS', version:) }
 
   subject { described_class.new(client) }
 
+  describe 'order attributes' do
+    let(:version) { Epics::Keyring::VERSION_25 }
+
+    it { expect(subject.to_xml).to include('<OrderAttribute>DZNNN</OrderAttribute>') }
+    it { expect(subject.to_xml).to include('<OrderType>HIA</OrderType>') }
+  end
+
+  include_examples '#to_xml'
+
   describe '#to_xml' do
-    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+    let(:version) { Epics::Keyring::VERSION_25 }
 
     describe 'validate against fixture' do
-      let(:hia) do
-        Nokogiri::XML(File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', 'xml', RUBY_ENGINE, 'hia.xml')))
-      end
+      let(:hia) { Nokogiri::XML(File.read(File.join( File.dirname(__FILE__), '..', 'fixtures', 'xml', RUBY_ENGINE, 'hia.xml'))) }
+      before { allow(Time).to receive(:now).and_return(Time.parse('2014-10-10T11:16:00Z')) }
 
       it 'will match exactly' do
         expect(Nokogiri::XML(subject.to_xml)).to be_equivalent_to(hia)
@@ -19,13 +26,13 @@ RSpec.describe Epics::HIA do
   end
 
   describe '#order_data' do
-    specify { expect(subject.order_data).to be_a_valid_ebics_doc }
+    let(:version) { Epics::Keyring::VERSION_25 }
+
+    specify { expect(subject.order_data).to be_a_valid_ebics_doc(version) }
 
     describe 'validate against fixture' do
-      let(:hia_request_order_data) do
-        Nokogiri::XML(File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', 'xml',
-                                          'hia_request_order_data.xml')))
-      end
+      let(:hia_request_order_data) { Nokogiri::XML(File.read(File.join( File.dirname(__FILE__), '..', 'fixtures', 'xml', 'hia_request_order_data.xml'))) }
+      before { allow(Time).to receive(:now).and_return(Time.parse('2014-10-10T11:16:00Z')) }
 
       it 'will match exactly' do
         expect(Nokogiri::XML(subject.order_data)).to be_equivalent_to(hia_request_order_data)
@@ -34,21 +41,17 @@ RSpec.describe Epics::HIA do
 
     context 'with x509 certificate' do
       let(:client) do
-        client = Epics::Client.new(key, 'secret', 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS')
-        client.x_509_certificates_content = {
-          x: generate_x_509_crt(client.x.key, '/C=GB/O=TestOrg/CN=test.example.org'),
-          e: generate_x_509_crt(client.e.key, '/C=GB/O=TestOrg/CN=test.example.org')
-        }
+        client = Epics::Client.new(File.open(File.join(File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')), 'secret', 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS')
+        client.keyring.user_authentication.certificate = Epics::Crypt::X509.new(generate_x_509_crt(client.authentication_key.key, '/C=GB/O=TestOrg/CN=test.example.org'))
+        client.keyring.user_encryption.certificate = Epics::Crypt::X509.new(generate_x_509_crt(client.encryption_key.key, '/C=GB/O=TestOrg/CN=test.example.org'))
         client
       end
 
       it 'includes x509 certificate' do
-        x_crt = Epics::X509Certificate.new(client.x_509_certificates_content[:x])
-        e_crt = Epics::X509Certificate.new(client.x_509_certificates_content[:e])
-        expect(subject.order_data).to include('<ds:X509IssuerName>/C=GB/O=TestOrg/CN=test.example.org</ds:X509IssuerName>')
-        expect(subject.order_data).to include('<ds:X509SerialNumber>2</ds:X509SerialNumber>')
-        expect(subject.order_data).to include("<ds:X509Certificate>#{x_crt.data}</ds:X509Certificate>")
-        expect(subject.order_data).to include("<ds:X509Certificate>#{e_crt.data}</ds:X509Certificate>")
+        expect(subject.order_data).to include('<ds:X509IssuerName>CN=test.example.org,O=TestOrg,C=GB</ds:X509IssuerName>')
+        expect(subject.order_data).to include('<ds:X509SerialNumber>1</ds:X509SerialNumber>')
+        expect(subject.order_data).to include("<ds:X509Certificate>#{client.keyring.user_authentication.certificate.data}</ds:X509Certificate>")
+        expect(subject.order_data).to include("<ds:X509Certificate>#{client.keyring.user_encryption.certificate.data}</ds:X509Certificate>")
       end
     end
   end