defra_ruby_mocks 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fcd5775c21149e97c7c65f92b1f469adf065565
-  data.tar.gz: b056b6419ada5eb1bf86dcabaee805cf6eae155a
+  metadata.gz: 11c12df8f46d57ee398b846e7b940eabb3ef666f
+  data.tar.gz: d11d804834f28614a23c4fd6bc486885a9f9bdd9
 SHA512:
-  metadata.gz: b6239c9c0d4ea46e2cb47b89dc44c67df263fcddf2704f85b46536529f6db67427f3f830d4842c0943f2eb9eb61558e92d08ac0d2bfd0bd81ec3b010f66f5de7
-  data.tar.gz: 494e1b4a8ef9bf6645be512e915faf5c41dfbc0927da4eb2dcda28f52bef8389adc7bd944437c01aca8ba8e40f10565fd6a0f02ad5a5377e773a22b7011cc141
+  metadata.gz: 6ecc755e31cf7a746265c1a4f3292b4e037ca7976040cc2350bf5c0ee89e0c630ce7fc3b416319418de7537a8a229b3f6cae80bbadaa700bb951923923087104
+  data.tar.gz: 8afc6250125e523384ccb27c0e543cd9cdeb0b678a9cf818b63a5bb7c34b458daeaabdd759b8babfd91ac6bd834281968362e34af104f4de3c4145e930483322

data/README.md

@@ -108,6 +108,8 @@ The list of possible statuses was taken from
 
 When mounted into an app you can simulate interacting with the Worldpay hosted pages service.
 
+#### Payments
+
 Making a payment with Worldpay essentially comes in 2 stages
 
 1. The app sends an XML request to Worldpay asking it to prepare for a new payment. Worldpay responds with a reference and a URL to redirect the user to
@@ -120,6 +122,14 @@ This Worldpay mock replicates those 2 interactions with the following urls
 - `../worldpay/payments-service`
 - `../worldpay/dispatcher`
 
+#### Refunds
+
+Requesting a refund from Worldpay is a single step process.
+
+1. The app sends an XML request to Worldpay with details of the order to be refunded and the amount. Worldpay returns an XML response confirming the request has been received
+
+Like payments, refund requests are also sent to the same url `../worldpay/payments-service`. The mock handles determining what request is being made and returns the appropriate response.
+
 #### Configuration
 
 In order to use the Worldpay mock you'll need to provide additional configuration details

data/app/controllers/defra_ruby_mocks/worldpay_controller.rb

@@ -6,14 +6,10 @@ module DefraRubyMocks
     before_action :set_default_response_format
 
     def payments_service
-      response_values = WorldpayRequestService.run(request.body.read)
+      @values = WorldpayRequestHandlerService.run(convert_request_body_to_xml)
 
-      @merchant_code = response_values[:merchant_code]
-      @order_code = response_values[:order_code]
-      @worldpay_id = response_values[:id]
-      @worldpay_url = response_values[:url]
-
-      respond_to :xml
+      render_payment_response if @values[:request_type] == :payment
+      render_refund_response if @values[:request_type] == :refund
     rescue StandardError
       head 500
     end
@@ -31,5 +27,17 @@ module DefraRubyMocks
       request.format = :xml
     end
 
+    def convert_request_body_to_xml
+      Nokogiri::XML(request.body.read)
+    end
+
+    def render_payment_response
+      render "defra_ruby_mocks/worldpay/payment_request"
+    end
+
+    def render_refund_response
+      render "defra_ruby_mocks/worldpay/refund_request"
+    end
+
   end
 end

data/app/services/defra_ruby_mocks/{worldpay_request_service.rb → worldpay_payment_service.rb}

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
 module DefraRubyMocks
-  class WorldpayRequestService < BaseService
-    def run(data)
+  class WorldpayPaymentService < BaseService
+    def run(merchant_code:, xml:)
       check_config
 
-      xml = Nokogiri::XML(data)
-      @merchant_code = extract_merchant_code(xml)
+      @merchant_code = merchant_code
       @order_code = extract_order_code(xml)
 
       {
@@ -25,11 +24,6 @@ module DefraRubyMocks
       raise InvalidConfigError, :worldpay_domain if domain.blank?
     end
 
-    def extract_merchant_code(xml)
-      payment_service = xml.at_xpath("//paymentService")
-      payment_service.attribute("merchantCode").text
-    end
-
     def extract_order_code(xml)
       order = xml.at_xpath("//order")
       order.attribute("orderCode").text

data/app/services/defra_ruby_mocks/worldpay_refund_service.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module DefraRubyMocks
+  class WorldpayRefundService < BaseService
+    def run(merchant_code:, xml:)
+      {
+        merchant_code: merchant_code,
+        order_code: extract_order_code(xml),
+        refund_value: extract_refund_value(xml),
+        currency_code: extract_currency_code(xml),
+        exponent: extract_exponent(xml)
+      }
+    end
+
+    private
+
+    def extract_order_code(xml)
+      order_modification = xml.at_xpath("//orderModification")
+      order_modification.attribute("orderCode").text
+    end
+
+    def extract_refund_value(xml)
+      amount = xml.at_xpath("//amount")
+      amount.attribute("value").text
+    end
+
+    def extract_currency_code(xml)
+      amount = xml.at_xpath("//amount")
+      amount.attribute("currencyCode").text
+    end
+
+    def extract_exponent(xml)
+      amount = xml.at_xpath("//amount")
+      amount.attribute("exponent").text
+    end
+  end
+end

data/app/services/defra_ruby_mocks/worldpay_request_handler_service.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module DefraRubyMocks
+  class WorldpayRequestHandlerService < BaseService
+    def run(xml)
+      arguments = {
+        merchant_code: extract_merchant_code(xml),
+        xml: xml
+      }
+
+      generate_response(arguments)
+    end
+
+    private
+
+    def extract_merchant_code(xml)
+      payment_service = xml.at_xpath("//paymentService")
+      payment_service.attribute("merchantCode").text
+    end
+
+    def generate_response(arguments)
+      return WorldpayPaymentService.run(arguments).merge(request_type: :payment) if payment_request?(arguments[:xml])
+      return WorldpayRefundService.run(arguments).merge(request_type: :refund) if refund_request?(arguments[:xml])
+
+      raise UnrecognisedWorldpayRequestError
+    end
+
+    def payment_request?(xml)
+      submit = xml.at_xpath("//submit")
+
+      !submit.nil?
+    end
+
+    def refund_request?(xml)
+      modify = xml.at_xpath("//modify")
+
+      !modify.nil?
+    end
+  end
+end

data/app/views/defra_ruby_mocks/worldpay/payment_request.xml.erb

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE paymentService PUBLIC "-//WorldPay//DTD WorldPay PaymentService v1//EN"
+        "http://dtd.worldpay.com/paymentService_v1.dtd">
+<paymentService version="1.4" merchantCode="<%= @values[:merchant_code] %>"><reply><orderStatus orderCode="<%= @values[:order_code] %>"><reference id="<%= @values[:id] %>"><%= @values[:url] %></reference></orderStatus></reply></paymentService>

data/app/views/defra_ruby_mocks/worldpay/refund_request.xml.erb

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE paymentService PUBLIC "-//WorldPay//DTD WorldPay PaymentService v1//EN"
+                                "http://dtd.worldpay.com/paymentService_v1.dtd">
+<paymentService version="1.4" merchantCode="<%= @values[:merchant_code] %>"><reply><ok><refundReceived orderCode="<%= @values[:order_code] %>"><amount value="<%= @values[:refund_value] %>" currencyCode="<%= @values[:currency_code] %>" exponent="<%= @values[:exponent] %>" debitCreditIndicator="credit"/></refundReceived></ok></reply></paymentService>

data/lib/defra_ruby_mocks/engine.rb

@@ -3,6 +3,7 @@
 require_relative "configuration"
 require_relative "invalid_config_error"
 require_relative "missing_registration_error"
+require_relative "unrecognised_worldpay_request_error"
 
 module DefraRubyMocks
   class Engine < ::Rails::Engine

data/lib/defra_ruby_mocks/unrecognised_worldpay_request_error.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module DefraRubyMocks
+  class UnrecognisedWorldpayRequestError < StandardError; end
+end

data/lib/defra_ruby_mocks/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DefraRubyMocks
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/fixtures/refund_request_invalid.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE paymentService PUBLIC '-//WorldPay/DTD WorldPay PaymentService v1/EN' 'http://dtd.worldpay.com/paymentService_v1.dtd'>
+<paymentService version="1.4">
+  <modify>
+  </modify>
+</paymentService>

data/spec/fixtures/refund_request_valid.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE paymentService PUBLIC '-//WorldPay/DTD WorldPay PaymentService v1/EN' 'http://dtd.worldpay.com/paymentService_v1.dtd'>
+<paymentService version="1.4" merchantCode="MERCHME">
+  <modify>
+    <orderModification orderCode="1579644835">
+      <refund>
+        <amount value="2500" currencyCode="GBP" exponent="2"/>
+      </refund>
+    </orderModification>
+  </modify>
+</paymentService>

data/spec/fixtures/unrecognised_request.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE paymentService PUBLIC '-//WorldPay/DTD WorldPay PaymentService v1/EN' 'http://dtd.worldpay.com/paymentService_v1.dtd'>
+<paymentService version="1.4" merchantCode="MERCHME">
+  <boom>
+  </boom>
+</paymentService>

data/spec/requests/worldpay_spec.rb

@@ -19,24 +19,41 @@ module DefraRubyMocks
       context "#payments_service" do
         let(:path) { "/defra_ruby_mocks/worldpay/payments-service" }
 
-        context "and the request is valid" do
-          let(:data) { File.read("spec/fixtures/worldpay_request_valid.xml") }
+        context "when a payment request is received" do
+          context "and the request is valid" do
+            let(:data) { File.read("spec/fixtures/payment_request_valid.xml") }
 
-          it "returns an XML response with a 200 code" do
-            get path, {}, "RAW_POST_DATA" => data
+            it "returns an XML response with a 200 code" do
+              get path, {}, "RAW_POST_DATA" => data
 
-            expect(response.content_type).to eq("application/xml")
-            expect(response.code).to eq("200")
+              expect(response.content_type).to eq("application/xml")
+              expect(response.code).to eq("200")
+              expect(response.body).to be_xml
+            end
+          end
+
+          context "and the request is invalid" do
+            let(:data) { File.read("spec/fixtures/payment_request_invalid.xml") }
+
+            it "returns a response with a 500 code" do
+              get path, {}, "RAW_POST_DATA" => data
+
+              expect(response.code).to eq("500")
+            end
           end
         end
 
-        context "and the request is invalid" do
-          let(:data) { File.read("spec/fixtures/worldpay_request_invalid.xml") }
+        context "when a refund request is received" do
+          context "and the request is valid" do
+            let(:data) { File.read("spec/fixtures/refund_request_valid.xml") }
 
-          it "returns a response with a 500 code" do
-            get path, {}, "RAW_POST_DATA" => data
+            it "returns an XML response with a 200 code" do
+              get path, {}, "RAW_POST_DATA" => data
 
-            expect(response.code).to eq("500")
+              expect(response.content_type).to eq("application/xml")
+              expect(response.code).to eq("200")
+              expect(response.body).to be_xml
+            end
           end
         end
       end

data/spec/services/{worldpay_request_service_spec.rb → worldpay_payment_service_spec.rb}

@@ -3,58 +3,61 @@
 require "rails_helper"
 
 module DefraRubyMocks
-  RSpec.describe WorldpayRequestService do
+  RSpec.describe WorldpayPaymentService do
     describe ".run" do
       after(:each) { Helpers::Configuration.reset_for_tests }
 
+      let(:merchant_code) { "MERCHME" }
+      let(:args) { { merchant_code: merchant_code, xml: xml } }
+
       context "when the mocks config is missing a worldpay domain" do
+        let(:xml) { nil }
+
         it "raises a 'InvalidConfigError'" do
-          expect { described_class.run(nil) }.to raise_error InvalidConfigError
+          expect { described_class.run(args) }.to raise_error InvalidConfigError
         end
       end
 
-      context "when the XML data is valid" do
+      context "when the XML is valid" do
         before(:each) do
           DefraRubyMocks.configure do |config|
             config.worldpay_domain = "http://localhost:3000/defra_ruby_mocks"
           end
         end
 
-        let(:data) { File.read("spec/fixtures/worldpay_request_valid.xml") }
+        let(:xml) { Nokogiri::XML(File.read("spec/fixtures/payment_request_valid.xml")) }
 
         context "the result it returns" do
           it "is a hash" do
-            expect(described_class.run(data)).to be_an_instance_of(Hash)
+            expect(described_class.run(args)).to be_an_instance_of(Hash)
           end
 
           it "contains 4 values" do
-            result = described_class.run(data).length
+            result = described_class.run(args).length
             expect(result).to eq(4)
           end
 
-          context "has values extracted from the XML data" do
-            it "a merchant code" do
-              result = described_class.run(data)[:merchant_code]
+          it "has the merchant code passed in" do
+            result = described_class.run(args)[:merchant_code]
 
-              expect(result).to eq("MERCHME")
-            end
+            expect(result).to eq(merchant_code)
+          end
 
-            it "an order code" do
-              result = described_class.run(data)[:order_code]
+          it "has an order code extracted from the XML" do
+            result = described_class.run(args)[:order_code]
 
-              expect(result).to eq("1577726052")
-            end
+            expect(result).to eq("1577726052")
           end
 
           context "has a generated ID which is" do
             it "10 characters long" do
-              result = described_class.run(data)[:id]
+              result = described_class.run(args)[:id]
 
               expect(result.length).to eq(10)
             end
 
             it "only made up of the digits 0 to 9" do
-              result = described_class.run(data)[:id]
+              result = described_class.run(args)[:id]
 
               expect(result.scan(/\D/).empty?).to be_truthy
             end
@@ -62,7 +65,7 @@ module DefraRubyMocks
             it "different each time" do
               results = []
               3.times do
-                results << described_class.run(data)[:id]
+                results << described_class.run(args)[:id]
               end
 
               expect(results.uniq.length).to eq(results.length)
@@ -71,7 +74,7 @@ module DefraRubyMocks
 
           context "has a url" do
             it "based on the configured domain, and extracted merchant and order codes" do
-              result = described_class.run(data)[:url]
+              result = described_class.run(args)[:url]
 
               expect(result).to eq("http://localhost:3000/defra_ruby_mocks/worldpay/dispatcher?OrderKey=MERCHME%5E1577726052")
             end
@@ -80,11 +83,11 @@ module DefraRubyMocks
 
       end
 
-      context "when the data is invalid" do
-        let(:data) { File.read("spec/fixtures/worldpay_request_invalid.xml") }
+      context "when the XML is invalid" do
+        let(:xml) { Nokogiri::XML(File.read("spec/fixtures/payment_request_invalid.xml")) }
 
         it "raises an error" do
-          expect { described_class.run(data) }.to raise_error StandardError
+          expect { described_class.run(args) }.to raise_error StandardError
         end
       end
     end

data/spec/services/worldpay_refund_service_spec.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+module DefraRubyMocks
+  RSpec.describe WorldpayRefundService do
+    describe ".run" do
+
+      let(:merchant_code) { "MERCHME" }
+      let(:args) { { merchant_code: merchant_code, xml: xml } }
+
+      context "when the XML is valid" do
+
+        let(:xml) { Nokogiri::XML(File.read("spec/fixtures/refund_request_valid.xml")) }
+
+        context "the result it returns" do
+          it "is a hash" do
+            expect(described_class.run(args)).to be_an_instance_of(Hash)
+          end
+
+          it "contains 5 values" do
+            result = described_class.run(args).length
+            expect(result).to eq(5)
+          end
+
+          it "has the merchant code passed in" do
+            result = described_class.run(args)[:merchant_code]
+
+            expect(result).to eq(merchant_code)
+          end
+
+          it "has an order code extracted from the XML" do
+            result = described_class.run(args)[:order_code]
+
+            expect(result).to eq("1579644835")
+          end
+
+          it "has the refund value extracted from the XML" do
+            result = described_class.run(args)[:refund_value]
+
+            expect(result).to eq("2500")
+          end
+
+          it "has a currency code extracted from the XML" do
+            result = described_class.run(args)[:currency_code]
+
+            expect(result).to eq("GBP")
+          end
+
+          it "has the exponent extracted from the XML" do
+            result = described_class.run(args)[:exponent]
+
+            expect(result).to eq("2")
+          end
+        end
+
+      end
+
+      context "when the XML is invalid" do
+        let(:xml) { Nokogiri::XML(File.read("spec/fixtures/refund_request_invalid.xml")) }
+
+        it "raises an error" do
+          expect { described_class.run(args) }.to raise_error StandardError
+        end
+      end
+    end
+  end
+end

data/spec/services/worldpay_request_handler_service_spec.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+module DefraRubyMocks
+  RSpec.describe WorldpayRequestHandlerService do
+    describe ".run" do
+      context "when a request is made" do
+
+        let(:merchant_code) { "MERCHME" }
+        let(:args) { { merchant_code: merchant_code, xml: xml } }
+
+        context "and it's for a payment" do
+          before do
+            allow_any_instance_of(WorldpayPaymentService).to receive(:generate_id) { order_id }
+          end
+
+          let(:xml) { Nokogiri::XML(File.read("spec/fixtures/payment_request_valid.xml")) }
+          let(:order_id) { "1234567890" }
+          let(:request_type) { { request_type: :payment } }
+          let(:response_values) do
+            {
+              merchant_code: merchant_code,
+              order_code: "1577726052",
+              id: order_id,
+              url: "http://example.com"
+            }
+          end
+
+          it "correctly determines the request service to use" do
+            expect(WorldpayPaymentService).to receive(:run).with(args) { response_values }
+
+            described_class.run(xml)
+          end
+
+          it "returns the values the controller needs to handle the request" do
+            expect(WorldpayPaymentService).to receive(:run).with(args) { response_values }
+
+            expect(described_class.run(xml)).to eq(request_type.merge(response_values))
+          end
+        end
+
+        context "and it's for a refund" do
+          let(:xml) { Nokogiri::XML(File.read("spec/fixtures/refund_request_valid.xml")) }
+          let(:request_type) { { request_type: :refund } }
+          let(:response_values) do
+            {
+              merchant_code: merchant_code,
+              order_code: "1579644835",
+              refund_value: "2500",
+              currency_code: "GBP",
+              exponent: "2"
+            }
+          end
+
+          it "correctly determines the request service to use" do
+            expect(WorldpayRefundService).to receive(:run).with(args) { response_values }
+
+            described_class.run(xml)
+          end
+
+          it "returns the values the controller needs to handle the request" do
+            expect(WorldpayRefundService).to receive(:run).with(args) { response_values }
+
+            expect(described_class.run(xml)).to eq(request_type.merge(response_values))
+          end
+        end
+
+        context "but it's not recognised" do
+          let(:xml) { Nokogiri::XML(File.read("spec/fixtures/unrecognised_request.xml")) }
+
+          it "raises a 'UnrecognisedWorldpayRequestError'" do
+            expect { described_class.run(xml) }.to raise_error UnrecognisedWorldpayRequestError
+          end
+        end
+      end
+    end
+  end
+end

data/spec/support/helpers/xml_matchers.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "rspec/expectations"
+
+RSpec::Matchers.define :be_xml do
+  match do
+    begin
+      Nokogiri::XML(actual, &:strict)
+
+      true
+    rescue Nokogiri::XML::SyntaxError
+      false
+    end
+  end
+
+  failure_message do |actual|
+    "expected that \"#{actual}\" would be a valid XML document"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defra_ruby_mocks
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Defra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -124,17 +124,21 @@ files:
 - app/controllers/defra_ruby_mocks/worldpay_controller.rb
 - app/services/defra_ruby_mocks/base_service.rb
 - app/services/defra_ruby_mocks/companies_house_service.rb
-- app/services/defra_ruby_mocks/worldpay_request_service.rb
+- app/services/defra_ruby_mocks/worldpay_payment_service.rb
+- app/services/defra_ruby_mocks/worldpay_refund_service.rb
+- app/services/defra_ruby_mocks/worldpay_request_handler_service.rb
 - app/services/defra_ruby_mocks/worldpay_response_service.rb
 - app/views/defra_ruby_mocks/company/not_found.json.erb
 - app/views/defra_ruby_mocks/company/show.json.erb
-- app/views/defra_ruby_mocks/worldpay/payments_service.xml.erb
+- app/views/defra_ruby_mocks/worldpay/payment_request.xml.erb
+- app/views/defra_ruby_mocks/worldpay/refund_request.xml.erb
 - config/routes.rb
 - lib/defra_ruby_mocks.rb
 - lib/defra_ruby_mocks/configuration.rb
 - lib/defra_ruby_mocks/engine.rb
 - lib/defra_ruby_mocks/invalid_config_error.rb
 - lib/defra_ruby_mocks/missing_registration_error.rb
+- lib/defra_ruby_mocks/unrecognised_worldpay_request_error.rb
 - lib/defra_ruby_mocks/version.rb
 - lib/tasks/changelog.rake
 - lib/tasks/defra_ruby_mocks_tasks.rake
@@ -176,19 +180,25 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/examples.txt
-- spec/fixtures/worldpay_request_invalid.xml
-- spec/fixtures/worldpay_request_valid.xml
+- spec/fixtures/payment_request_invalid.xml
+- spec/fixtures/payment_request_valid.xml
+- spec/fixtures/refund_request_invalid.xml
+- spec/fixtures/refund_request_valid.xml
+- spec/fixtures/unrecognised_request.xml
 - spec/lib/configuration_spec.rb
 - spec/rails_helper.rb
 - spec/requests/company_spec.rb
 - spec/requests/worldpay_spec.rb
 - spec/services/companies_house_service_spec.rb
-- spec/services/worldpay_request_service_spec.rb
+- spec/services/worldpay_payment_service_spec.rb
+- spec/services/worldpay_refund_service_spec.rb
+- spec/services/worldpay_request_handler_service_spec.rb
 - spec/services/worldpay_response_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers/configuration.rb
 - spec/support/helpers/helpers.rb
 - spec/support/helpers/waste_carriers_engine.rb
+- spec/support/helpers/xml_matchers.rb
 - spec/support/pry.rb
 - spec/support/simplecov.rb
 homepage: https://github.com/DEFRA/defra-ruby-mocks
@@ -260,12 +270,18 @@ test_files:
 - spec/support/simplecov.rb
 - spec/support/pry.rb
 - spec/support/helpers/helpers.rb
+- spec/support/helpers/xml_matchers.rb
 - spec/support/helpers/configuration.rb
 - spec/support/helpers/waste_carriers_engine.rb
 - spec/lib/configuration_spec.rb
-- spec/fixtures/worldpay_request_valid.xml
-- spec/fixtures/worldpay_request_invalid.xml
+- spec/fixtures/unrecognised_request.xml
+- spec/fixtures/payment_request_invalid.xml
+- spec/fixtures/refund_request_valid.xml
+- spec/fixtures/payment_request_valid.xml
+- spec/fixtures/refund_request_invalid.xml
 - spec/rails_helper.rb
 - spec/services/worldpay_response_service_spec.rb
 - spec/services/companies_house_service_spec.rb
-- spec/services/worldpay_request_service_spec.rb
+- spec/services/worldpay_payment_service_spec.rb
+- spec/services/worldpay_refund_service_spec.rb
+- spec/services/worldpay_request_handler_service_spec.rb

data/app/views/defra_ruby_mocks/worldpay/payments_service.xml.erb

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE paymentService PUBLIC "-//WorldPay//DTD WorldPay PaymentService v1//EN"
-        "http://dtd.worldpay.com/paymentService_v1.dtd">
-<paymentService version="1.4" merchantCode="<%= @merchant_code %>"><reply><orderStatus orderCode="<%= @order_code %>"><reference id="<%= @worldpay_id %>"><%= @worldpay_url %></reference></orderStatus></reply></paymentService>