fix: parse expected interactions with configured pact specification version

Author: bethesque

lib/pact/mock_service/request_handlers.rb

@@ -27,8 +27,8 @@ def initialize name, logger, session, options
             SessionDelete.new(name, logger, session),
             MissingInteractionsGet.new(name, logger, session),
             VerificationGet.new(name, logger, session),
-            InteractionPost.new(name, logger, session),
-            InteractionsPut.new(name, logger, session),
+            InteractionPost.new(name, logger, session, Pact::SpecificationVersion.new(options[:pact_specification_version])),
+            InteractionsPut.new(name, logger, session, Pact::SpecificationVersion.new(options[:pact_specification_version])),
             InteractionDelete.new(name, logger, session),
             LogGet.new(name, logger),
             PactPost.new(name, logger, session),

lib/pact/mock_service/request_handlers/interaction_post.rb

@@ -6,9 +6,10 @@ module MockService
     module RequestHandlers
       class InteractionPost < BaseAdministrationRequestHandler
 
-        def initialize name, logger, session
+        def initialize name, logger, session, pact_specification_version
           super name, logger
           @session = session
+          @pact_specification_version = pact_specification_version
         end
 
         def request_path
@@ -21,7 +22,8 @@ def request_method
 
         def respond env
           request_body = env['rack.input'].string
-          interaction = Interaction.from_hash(JSON.load(request_body)) # Load creates the Pact::XXX classes
+          parsing_options = { pact_specification_version: pact_specification_version }
+          interaction = Interaction.from_hash(JSON.load(request_body), parsing_options) # Load creates the Pact::XXX classes
 
           begin
             session.add_expected_interaction interaction
@@ -34,7 +36,7 @@ def respond env
 
         private
 
-        attr_accessor :session
+        attr_accessor :session, :pact_specification_version
       end
     end
   end

lib/pact/mock_service/request_handlers/interactions_put.rb

@@ -8,9 +8,10 @@ module MockService
     module RequestHandlers
       class InteractionsPut < BaseAdministrationRequestHandler
 
-        def initialize name, logger, session
+        def initialize name, logger, session, pact_specification_version
           super name, logger
           @session = session
+          @pact_specification_version = pact_specification_version
         end
 
         def request_path
@@ -23,7 +24,8 @@ def request_method
 
         def respond env
           request_body = JSON.load(env['rack.input'].string)
-          interactions = request_body['interactions'].collect { | hash | Interaction.from_hash(hash) }
+          parsing_options = { pact_specification_version: pact_specification_version }
+          interactions = request_body['interactions'].collect { | hash | Interaction.from_hash(hash, parsing_options) }
           begin
             session.set_expected_interactions interactions
             text_response('Registered interactions')
@@ -34,7 +36,7 @@ def respond env
 
         private
 
-        attr_accessor :session
+        attr_accessor :session, :pact_specification_version
 
       end
     end

spec/lib/pact/mock_service/request_handlers/interaction_post_spec.rb

@@ -6,6 +6,7 @@ module RequestHandlers
       describe InteractionPost do
         let(:session) { instance_double('Pact::MockService::Session') }
         let(:logger) { double('Logger').as_null_object }
+        let(:pact_specification_version) { Pact::SpecificationVersion.new("2") }
         let(:interaction_json) {
           {
             description: "some description",
@@ -21,7 +22,7 @@ module RequestHandlers
           }
         end
 
-        subject { described_class.new '', logger, session }
+        subject { described_class.new '', logger, session, pact_specification_version }
 
         context "adding the interaction will raise SameSameButDifferentError" do
           let(:message) { "my message" }