feat(consumer): only update pact if test suite passes

Author: bethesque

lib/pact/message/consumer/configuration/message_builder.rb

@@ -1,6 +1,6 @@
 require 'pact/message/consumer/consumer_contract_builder'
 require 'pact/message/consumer/consumer_contract_builders'
-# require 'pact/consumer/world'
+require 'pact/message/consumer/world'
 
 module Pact
   module Message
@@ -58,7 +58,8 @@ def create_consumer_contract_builders_method consumer_contract_builder
             Pact::Message::Consumer::ConsumerContractBuilders.send(:define_method, @name.to_sym) do
               consumer_contract_builder
             end
-            # Pact.consumer_world.add_consumer_contract_builder consumer_contract_builder
+
+            Pact::Message.consumer_world.add_consumer_contract_builder consumer_contract_builder
           end
         end
       end

lib/pact/message/consumer/consumer_contract_builder.rb

@@ -22,27 +22,32 @@ def is_expected_to_send(description)
         end
 
         def send_message_string
-          yield contents.reified_contents_string if block_given?
+          if block_given?
+            yield contents.reified_contents_string
+          end
         end
 
         def handle_interaction_fully_defined(interaction)
           @contents = interaction.contents
           @contents_string = interaction.contents.to_s
           @interactions << interaction
           @interaction_builder = nil
-          # TODO pull these from pact config
-          Pact::Message::Consumer::UpdatePact.call(interaction, "./spec/pacts", consumer_name, provider_name, "2.0.0")
+
         end
 
         def verify example_description
           #
           # TODO check that message was actually yielded
         end
 
+        def write_pact
+          Pact::Message::Consumer::UpdatePact.call(interactions, "./spec/pacts", consumer_name, provider_name, "2.0.0")
+        end
+
         private
 
         attr_writer :interaction_builder
-        attr_accessor :consumer_name, :provider_name, :consumer_contract_details, :contents
+        attr_accessor :consumer_name, :provider_name, :consumer_contract_details, :contents, :interactions
 
         def interaction_builder
           @interaction_builder ||=

lib/pact/message/consumer/rspec.rb

@@ -20,7 +20,15 @@ module RSpec
 RSpec.configure do |config|
   config.include Pact::Message::Consumer::RSpec, :pact => :message
 
-  config.after :each, :pact => true do | example |
+  config.before :each, :pact => :message do | example |
+    hooks.before_each Pact::RSpec.full_description(example)
+  end
+
+  config.after :each, :pact => :message do | example |
     hooks.after_each Pact::RSpec.full_description(example)
   end
+
+  config.after :all do
+    hooks.after_suite
+  end
 end

lib/pact/message/consumer/spec_hooks.rb

@@ -1,12 +1,24 @@
+require 'pact/message/consumer/world'
+
 module Pact
   module Message
     module Consumer
       class SpecHooks
+        def before_each example_description
+          Pact::Message.consumer_world.register_pact_example_ran
+        end
+
         def after_each example_description
           Pact.configuration.message_provider_verifications.each do | message_provider_verification |
             message_provider_verification.call example_description
           end
         end
+
+        def after_suite
+          if Pact::Message.consumer_world.any_pact_examples_ran?
+            Pact::Message.consumer_world.consumer_contract_builders.each(&:write_pact)
+          end
+        end
       end
     end
   end

lib/pact/message/consumer/update_pact.rb

@@ -6,23 +6,23 @@ module Message
     module Consumer
       class UpdatePact
 
-        def initialize message, pact_dir, consumer_name, provider_name, pact_specification_version
+        def initialize messages, pact_dir, consumer_name, provider_name, pact_specification_version
           @pact_dir = pact_dir
-          @message = message
+          @messages = messages
           @consumer_name = consumer_name
           @provider_name = provider_name
           @pact_specification_version = pact_specification_version
         end
 
-        def self.call(message, pact_dir, consumer_name, provider_name, pact_specification_version)
-          new(message, pact_dir, consumer_name, provider_name, pact_specification_version).call
+        def self.call(messages, pact_dir, consumer_name, provider_name, pact_specification_version)
+          new(messages, pact_dir, consumer_name, provider_name, pact_specification_version).call
         end
 
         def call
           details = {
             consumer: {name: consumer_name},
             provider: {name: provider_name},
-            interactions: [message],
+            interactions: [*messages],
             pactfile_write_mode: :update,
             pact_dir: pact_dir,
             pact_specification_version: pact_specification_version,
@@ -36,7 +36,7 @@ def call
 
         private
 
-        attr_reader :message, :pact_dir, :consumer_name, :provider_name, :pact_specification_version
+        attr_reader :messages, :pact_dir, :consumer_name, :provider_name, :pact_specification_version
       end
     end
   end

lib/pact/message/consumer/world.rb

@@ -0,0 +1,36 @@
+module Pact
+  module Message
+    def self.consumer_world
+      @consumer_world ||= Consumer::World.new
+    end
+
+    # internal api, for testing only
+    def self.clear_consumer_world
+      @consumer_world = nil
+    end
+
+    module Consumer
+      class World
+        def initialize
+          @any_pact_examples_ran = false
+        end
+
+        def consumer_contract_builders
+          @consumer_contract_builders ||= []
+        end
+
+        def add_consumer_contract_builder consumer_contract_builder
+          consumer_contract_builders << consumer_contract_builder
+        end
+
+        def register_pact_example_ran
+          @any_pact_examples_ran = true
+        end
+
+        def any_pact_examples_ran?
+          @any_pact_examples_ran
+        end
+      end
+    end
+  end
+end

lib/pact/pact-message.rb

@@ -0,0 +1 @@
+require 'pact/message'

spec/features/create_message_pact_spec.rb

@@ -62,11 +62,4 @@ def call(content_string)
 
     expect(message_handler.output_stream.string).to eq ("Hello John")
   end
-
-  it "merges the message into the pact file" do
-    pact_hash = JSON.parse(File.read(ZOO_PACT_FILE_PATH), symbolize_names: true)
-    expect(pact_hash[:consumer][:name]).to eq "Zoo Consumer"
-    expect(pact_hash[:provider][:name]).to eq "Zoo Provider"
-    expect(pact_hash[:messages].size).to eq 2
-  end
 end

…create_message_pact_with_failure_spec.rb …create_message_pact_with_failure_test.rbspec/features/create_message_pact_with_failure_spec.rb renamed to spec/features/create_message_pact_with_failure_test.rb spec/features/create_message_pact_with_failure_spec.rb renamed to spec/features/create_message_pact_with_failure_test.rb

@@ -33,22 +33,17 @@ def call(content_string)
 
   let(:message_handler) { MessageHandler.new }
 
-  it "allows a consumer to test that it can handle a message example correctly", pact: :message, pending: true do
+  it "allows a consumer to test that it can handle a message example correctly", pact: :message do
     bar_producer
       .given("there is an alligator named Mary")
       .is_expected_to_send("an alligator message")
       .with_metadata(type: 'animal')
       .with_content(name: "Mary")
 
-    bar_producer.send_message do | content_string |
+    bar_producer.send_message_string do | content_string |
       message_handler.call(content_string)
     end
 
     expect(message_handler.output_stream.string).to eq ("Hello The Wrong Name")
   end
-
-
-  it "merges the message into the pact file", pending: true do
-    expect(File.exist?(FOO_BAR_PACT_FILE_PATH)).to be false
-  end
 end

spec/lib/pact/message/consumer/interaction_decorator_spec.rb

@@ -11,7 +11,7 @@ module Consumer
               provider_states: [double('Pact::ProviderState', as_json: provider_state_json)],
               contents: double('Pact::ConsumerContract::Message::Contents', contents: contents_object),
               metadata: { content_type: 'foo/bar' }
-              )
+            )
           end
           let(:contents_object) do
             { 'foo' => Pact.like('bar') }