epics 2.10.0 → 3.0.0.rc1

data/spec/orders/hkd_spec.rb

@@ -1,11 +1,30 @@
 RSpec.describe Epics::HKD 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) }
 
-  describe '#to_xml' do
-    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+  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>HKD</OrderType>') }
+  end
+
+  include_examples '#to_xml'
+
+  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: 'HKD'
   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: 'HKD', ebics_version: 'H003'
+  end
 end

data/spec/orders/hpb_spec.rb

@@ -1,11 +1,14 @@
 RSpec.describe Epics::HPB 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) }
 
-  describe '#to_xml' do
-    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+  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>HPB</OrderType>') }
   end
 
+  include_examples '#to_xml'
 end

data/spec/orders/hpd_spec.rb

@@ -1,11 +1,30 @@
 RSpec.describe Epics::HPD 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) }
 
-  describe '#to_xml' do
-    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+  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>HPD</OrderType>') }
+  end
+
+  include_examples '#to_xml'
+
+  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: 'HPD'
   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: 'HPD', ebics_version: 'H003'
+  end
 end

data/spec/orders/htd_spec.rb

@@ -1,11 +1,30 @@
 RSpec.describe Epics::HTD 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) }
 
-  describe '#to_xml' do
-    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+  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>HTD</OrderType>') }
+  end
+
+  include_examples '#to_xml'
+
+  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: 'HTD'
   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: 'HTD', ebics_version: 'H003'
+  end
 end

data/spec/orders/ini_spec.rb

@@ -1,17 +1,23 @@
 RSpec.describe Epics::INI 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')) }
-  before { allow(subject).to receive(:timestamp) { '2014-10-10T11:16:00Z' } }
+  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>INI</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(:signature_order_data) do
-        Nokogiri::XML(File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', 'xml', RUBY_ENGINE, 'ini.xml')))
-      end
+      let(:signature_order_data) { Nokogiri::XML(File.read(File.join( File.dirname(__FILE__), '..', 'fixtures', 'xml', RUBY_ENGINE, 'ini.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(signature_order_data)
@@ -20,13 +26,13 @@ RSpec.describe Epics::INI do
   end
 
   describe '#key_signature' do
-    specify { expect(subject.key_signature).to be_a_valid_ebics_doc }
+    let(:version) { Epics::Keyring::VERSION_25 }
+
+    specify { expect(subject.key_signature).to be_a_valid_ebics_doc(version) }
 
     describe 'validate against fixture' do
-      let(:signature_order_data) do
-        Nokogiri::XML(File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', 'xml',
-                                          'signature_pub_key_order_data.xml')))
-      end
+      let(:signature_order_data) { Nokogiri::XML(File.read(File.join( File.dirname(__FILE__), '..', 'fixtures', 'xml', 'signature_pub_key_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.key_signature)).to be_equivalent_to(signature_order_data)
@@ -35,16 +41,15 @@ RSpec.describe Epics::INI 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 = {a: generate_x_509_crt(client.a.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_signature.certificate = Epics::Crypt::X509.new(generate_x_509_crt(client.signature_key.key, '/C=GB/O=TestOrg/CN=test.example.org'))
         client
       end
 
       it 'includes x509 certificate' do
-        a_crt = Epics::X509Certificate.new(client.x_509_certificates_content[:a])
-        expect(subject.key_signature).to include('<ds:X509IssuerName>/C=GB/O=TestOrg/CN=test.example.org</ds:X509IssuerName>')
-        expect(subject.key_signature).to include('<ds:X509SerialNumber>2</ds:X509SerialNumber>')
-        expect(subject.key_signature).to include("<ds:X509Certificate>#{a_crt.data}</ds:X509Certificate>")
+        expect(subject.key_signature).to include('<ds:X509IssuerName>CN=test.example.org,O=TestOrg,C=GB</ds:X509IssuerName>')
+        expect(subject.key_signature).to include('<ds:X509SerialNumber>1</ds:X509SerialNumber>')
+        expect(subject.key_signature).to include("<ds:X509Certificate>#{client.keyring.user_signature.certificate.data}</ds:X509Certificate>")
       end
     end
   end

data/spec/orders/ptk_spec.rb

@@ -1,9 +1,32 @@
 RSpec.describe Epics::PTK 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, from: "2014-09-01", to: "2014-09-30") }
+  subject { described_class.new(client, from: Date.parse('2014-09-01'), to: Date.parse('2014-09-30')) }
 
-  describe '#to_xml' do
-    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+  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>PTK</OrderType>') }
+  end
+
+  include_examples '#to_xml'
+
+  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: 'PTK', from: '2014-09-01', to: '2014-09-30'
+  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 date range',
+      order_type: 'PTK', from: '2014-09-01', to: '2014-09-30', ebics_version: 'H003'
   end
 end

data/spec/orders/sta_spec.rb

@@ -1,39 +1,157 @@
 RSpec.describe Epics::STA 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')) }
 
-    describe '#to_xml' do
-      specify { expect(order.to_xml).to be_a_valid_ebics_doc }
+    include_examples '#to_xml'
+    include_examples '#to_receipt_xml'
 
+    describe '#to_xml' do
+      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 'H005 request structure' do
+      let(:version) { Epics::Keyring::VERSION_30 }
+      let(:xml) { Nokogiri::XML(subject.to_xml) }
+      let(:ns) { { 'e' => 'urn:org:ebics:H005' } }
+
+      include_examples 'a valid ebicsRequest H005 download with date range',
+        service_name: 'EOP', msg_name: 'mt940', from: '2014-09-01', to: '2014-09-30'
+    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' } }
 
-      specify { expect(order.to_receipt_xml).to be_a_valid_ebics_doc }
+      include_examples 'a valid ebicsRequest H005 receipt'
+    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 with date range',
+        order_type: 'STA', 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' } }
+
+      include_examples 'a valid ebicsRequest download with date range',
+        order_type: 'STA', 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>STA</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 'H005 request structure' do
+      let(:version) { Epics::Keyring::VERSION_30 }
+      let(:xml) { Nokogiri::XML(subject.to_xml) }
+      let(:ns) { { 'e' => 'urn:org:ebics:H005' } }
+
+      include_examples 'a valid ebicsRequest H005 download',
+        service_name: 'EOP', msg_name: 'mt940'
+    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 H005 receipt'
+    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: 'STA'
+    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: 'STA', 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/vmk_spec.rb

@@ -1,9 +1,41 @@
 RSpec.describe Epics::VMK 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, from: "2014-09-01", to: "2014-09-30") }
+  subject { described_class.new(client, from: Date.parse('2014-09-01'), to: Date.parse('2014-09-30')) }
 
-  describe '#to_xml' do
-    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+  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>VMK</OrderType>') }
+  end
+
+  include_examples '#to_xml'
+
+  describe 'H005 request structure' do
+    let(:version) { Epics::Keyring::VERSION_30 }
+    let(:xml) { Nokogiri::XML(subject.to_xml) }
+    let(:ns) { { 'e' => 'urn:org:ebics:H005' } }
+
+    include_examples 'a valid ebicsRequest H005 download with date range',
+      service_name: 'STM', msg_name: 'mt942', from: '2014-09-01', to: '2014-09-30'
+  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 with date range',
+      order_type: 'VMK', from: '2014-09-01', to: '2014-09-30'
+  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 date range',
+      order_type: 'VMK', from: '2014-09-01', to: '2014-09-30', ebics_version: 'H003'
   end
 end

data/spec/orders/wss_spec.rb

@@ -1,9 +1,35 @@
 RSpec.describe Epics::WSS 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) }
 
-  describe '#to_xml' do
-    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+  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>WSS</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
+
+  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: 'WSS'
+  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: 'WSS', ebics_version: 'H003'
   end
 end

data/spec/orders/x_509_certificate_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Epics::X509Certificate do
+RSpec.describe Epics::Crypt::X509 do
   subject(:x_509_certificate) { described_class.new(crt_content) }
 
   let(:key) { OpenSSL::PKey::RSA.new(2048) }
@@ -23,4 +23,12 @@ RSpec.describe Epics::X509Certificate do
       expect(x_509_certificate.data).to end_with('==')
     end
   end
+
+  describe '#fingerprint' do
+    it 'returns uppercase SHA256 hex digest' do
+      expect(x_509_certificate.fingerprint).to be_a(String)
+      expect(x_509_certificate.fingerprint.size).to eq(64)
+      expect(x_509_certificate.fingerprint).to match(/\A[0-9A-F]{64}\z/)
+    end
+  end
 end

data/spec/orders/xct_spec.rb

@@ -0,0 +1,63 @@
+RSpec.describe Epics::XCT 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) }
+
+  describe 'order attributes' do
+    let(:version) { Epics::Keyring::VERSION_25 }
+
+    it { expect(subject.to_xml).to include('<OrderAttribute>OZHNN</OrderAttribute>') }
+    it { expect(subject.to_xml).to include('<OrderType>XCT</OrderType>') }
+  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]
+
+  # EBICS 3.0 defines no BTF service equivalent to XCT.
+  describe 'H005' do
+    let(:version) { Epics::Keyring::VERSION_30 }
+
+    it 'refuses to build a request rather than guessing a service' do
+      expect { subject.to_xml }.to raise_error(Epics::VersionSupportError)
+    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 upload', order_type: 'XCT', order_attribute: 'OZHNN'
+  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', order_type: 'XCT', order_attribute: 'OZHNN', 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/xds_spec.rb

@@ -1,15 +1,22 @@
 RSpec.describe Epics::XDS 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(:document) { File.read( File.join( File.dirname(__FILE__), '..', 'fixtures', 'xml', 'cd1.xml') ) }
+
   subject { described_class.new(client, document) }
 
-  describe '#to_xml' do
-    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+  describe 'order attributes' do
+    let(:version) { Epics::Keyring::VERSION_25 }
+
+    it { expect(subject.to_xml).to include('<OrderAttribute>OZHNN</OrderAttribute>') }
+    it { expect(subject.to_xml).to include('<OrderType>XDS</OrderType>') }
   end
 
-  describe '#to_transfer_xml' do
-    before { subject.transaction_id = SecureRandom.hex(16) }
+  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]
 
-    specify { expect(subject.to_transfer_xml).to be_a_valid_ebics_doc }
+  describe '#to_xml H005' do
+    let(:version) { Epics::Keyring::VERSION_30 }
+    it('raises VersionSupportError') { expect { subject.to_xml }.to raise_error(Epics::VersionSupportError) }
   end
+
 end