pact 1.21.0 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aece3dcee5f119e9d84e091ed3509399cb4e1b2
-  data.tar.gz: ba4ea1bb76866f1a12457c5bbc276774d77220c7
+  metadata.gz: 98e5eb1496b65c594ed13101b2fc458979b0dcc3
+  data.tar.gz: '091e47ad1474581a0d6d5fa47c6feded20b10d9a'
 SHA512:
-  metadata.gz: da8af3dbfe258659facc5e384c5db79d43327796778bd85fadaf19894f19bffafada6b6fd2ccbdcbd6421a48ef6c970cea43208447c3ff00498f3f0537fb47b0
-  data.tar.gz: 0b2b5f1f931bd65bb8e443cb512bca8e8772c2fdbcc139c12b67ec8742c42ab4e46bc3094f121d8847399b880d1771faa29dba47ce3eded737ea0ced55c7d43c
+  metadata.gz: 4b222248d8f3d7fc8b5dc5631945b1e44ae1ecb8175d5caea1efda1d57a2073d7e87cc874a52128ce750246170bf141fcb40dcfffb95d00e0f49fc65c1fb9e89
+  data.tar.gz: e65bd27bd345906792632cfa52a19d4c300e9bdfc3249229849d8ce04a36ff921d69feea8ba86272bbeac1f24bcce861ef213780b5c081d1f83c9e6627ba0e88

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v1.22.0"></a>
+### v1.22.0 (2018-03-16)
+
+
+#### Features
+
+* do not create reports/pacts/help.md when executing verify from a wrapper language	 ([f1a2cd4](/../../commit/f1a2cd4))
+* add support for verifying message pacts	 ([fa98102](/../../commit/fa98102))
+
+
 <a name="v1.21.0"></a>
 ### v1.21.0 (2018-03-19)
 

data/lib/pact/provider/rspec.rb

@@ -77,31 +77,52 @@ module Pact
 
           describe description_for(interaction), metadata do
 
-            describe "with #{interaction.request.method_and_path}" do
-
-              interaction_context = InteractionContext.new
-
-              before do | example |
-                interaction_context.run_once :before do
-                  Pact.configuration.logger.info "Running example '#{Pact::RSpec.full_description(example)}'"
-                  set_up_provider_state interaction.provider_state, options[:consumer]
-                  replay_interaction interaction
-                  interaction_context.last_response = last_response
-                end
+            interaction_context = InteractionContext.new
+
+            before do | example |
+              interaction_context.run_once :before do
+                Pact.configuration.logger.info "Running example '#{Pact::RSpec.full_description(example)}'"
+                set_up_provider_state interaction.provider_state, options[:consumer]
+                replay_interaction interaction
+                interaction_context.last_response = last_response
               end
+            end
 
-              after do
-                interaction_context.run_once :after do
-                  tear_down_provider_state interaction.provider_state, options[:consumer]
-                end
+            after do
+              interaction_context.run_once :after do
+                tear_down_provider_state interaction.provider_state, options[:consumer]
               end
-
-              describe_response Pact::Response.new(interaction.response), interaction_context
-
             end
 
+            if interaction.respond_to?(:message?) && interaction.message?
+              describe_message Pact::Response.new(interaction.response), interaction_context
+            else
+              describe "with #{interaction.request.method_and_path}" do
+                describe_response Pact::Response.new(interaction.response), interaction_context
+              end
+            end
           end
+        end
 
+        def describe_message expected_response, interaction_context
+          include Pact::RSpec::Matchers
+          extend Pact::Matchers::Messages
+
+          let(:expected_content) { expected_response.body[:content] }
+          let(:response) { interaction_context.last_response }
+          let(:differ) { Pact.configuration.body_differ_for_content_type diff_content_type }
+          let(:diff_formatter) { Pact.configuration.diff_formatter_for_content_type diff_content_type }
+          let(:diff_options) { { with: differ, diff_formatter: diff_formatter } }
+          let(:diff_content_type) { 'application/json' }
+          let(:response_body) { parse_body_from_response(response) }
+          let(:actual_content) { response_body['content'] }
+
+          it "has matching content" do
+            if response.status != 200
+              raise "An error was raised while verifying the message. The response body is: #{response.body}"
+            end
+            expect(actual_content).to match_term expected_content, diff_options
+          end
         end
 
         def describe_response expected_response, interaction_context
@@ -124,7 +145,8 @@ module Pact
             let(:diff_options) { { with: differ, diff_formatter: diff_formatter } }
 
             if expected_response.status
-              it "has status code #{expected_response.status}" do
+              it "has status code #{expected_response.status}" do | example |
+                set_metadata(example, :pact_actual_status, response_status)
                 expect(response_status).to eql expected_response_status
               end
             end
@@ -132,7 +154,8 @@ module Pact
             if expected_response.headers
               describe "includes headers" do
                 expected_response.headers.each do |name, expected_header_value|
-                  it "\"#{name}\" which #{expected_desc_for_it(expected_header_value)}" do
+                  it "\"#{name}\" which #{expected_desc_for_it(expected_header_value)}" do  | example |
+                    set_metadata(example, :pact_actual_headers, response.headers)
                     header_value = response.headers[name]
                     expect(header_value).to match_header(name, expected_header_value)
                   end
@@ -141,8 +164,9 @@ module Pact
             end
 
             if expected_response.body
-              it "has a matching body" do
-                expect(response_body).to match_term expected_response_body, diff_options
+              it "has a matching body" do | example |
+                set_metadata(example, :pact_actual_body, response_body)
+                expect(response_body).to match_term expected_response_body, diff_options, example
               end
             end
           end
@@ -155,7 +179,6 @@ module Pact
         def interaction_description_for_rerun_command interaction
           description_for(interaction).capitalize + ( interaction.provider_state ? " given #{interaction.provider_state}" : "")
         end
-
       end
 
       # The "arrange" and "act" parts of the test really only need to be run once,

data/lib/pact/provider/rspec/matchers.rb

@@ -4,11 +4,9 @@ require 'pact/provider/matchers/messages'
 require 'pact/rspec'
 require 'pact/shared/json_differ'
 
-
 module Pact
   module RSpec
     module Matchers
-
       module RSpec2Delegator
         # For backwards compatiblity with rspec-2
         def method_missing(method, *args, &block)
@@ -21,33 +19,40 @@ module Pact
       end
 
       class MatchTerm
-
         include Pact::Matchers::Messages
         include RSpec2Delegator
 
-        def initialize expected, differ, diff_formatter
+        def initialize expected, differ, diff_formatter, example
           @expected = expected
           @differ = differ
           @diff_formatter = diff_formatter
+          @example = example
         end
 
         def matches? actual
           @actual = actual
-          (@difference = @differ.call(@expected, @actual)).empty?
+          @difference = @differ.call(@expected, @actual)
+          unless @difference.empty?
+            Pact::RSpec.with_rspec_3 do
+              @example.metadata[:pact_diff] = @difference
+            end
+            Pact::RSpec.with_rspec_2 do
+              @example.example.metadata[:pact_diff] = @difference
+            end
+          end
+          @difference.empty?
         end
 
         def failure_message
           match_term_failure_message @difference, @actual, @diff_formatter, Pact::RSpec.color_enabled?
         end
-
       end
 
-      def match_term expected, options
-        MatchTerm.new(expected, options.fetch(:with), options.fetch(:diff_formatter))
+      def match_term expected, options, example
+        MatchTerm.new(expected, options.fetch(:with), options.fetch(:diff_formatter), example)
       end
 
       class MatchHeader
-
         include Pact::Matchers
         include Pact::Matchers::Messages
         include RSpec2Delegator
@@ -65,33 +70,11 @@ module Pact
         def failure_message
           match_header_failure_message @header_name, @expected, @actual
         end
-
       end
 
       def match_header header_name, expected
         MatchHeader.new(header_name, expected)
       end
-
     end
   end
 end
-
-
-# RSpec::Matchers.define :match_header do |header_name, expected|
-
-#   include Pact::Matchers
-#   include Pact::Matchers::Messages
-
-#   match do |actual|
-#     diff(expected, actual).empty?
-#   end
-
-#   def failure_message_for_should(actual)
-#     match_header_failure_message header_name, expected, actual
-#   end
-
-#   # failure_message_for_should do | actual |
-#   #   match_header_failure_message header_name, expected, actual
-#   # end
-
-# end

data/lib/pact/provider/rspec/pact_broker_formatter.rb

@@ -1,6 +1,7 @@
 require 'rspec/core/formatters'
 require 'pact/provider/verification_results/publish_all'
 require 'term/ansicolor'
+require 'pact/matchers/extract_diff_messages'
 
 module Pact
   module Provider
@@ -59,6 +60,24 @@ module Pact
                 message: ::Term::ANSIColor.uncolor(example.exception.message)
               }
             end
+
+            if example.metadata[:pact_actual_status]
+              hash[:actualStatus] = example.metadata[:pact_actual_status]
+            end
+
+            if example.metadata[:pact_actual_headers]
+              hash[:actualHeaders] = example.metadata[:pact_actual_headers]
+            end
+
+            if example.metadata[:pact_actual_body]
+              hash[:actualBody] = example.metadata[:pact_actual_body]
+            end
+
+            if example.metadata[:pact_diff]
+              hash[:differences] = Pact::Matchers::ExtractDiffMessages.call(example.metadata[:pact_diff])
+                                    .to_a
+                                    .collect{ | description | {description: description} }
+            end
           end
         end
       end

data/lib/pact/provider/test_methods.rb

@@ -41,6 +41,16 @@ module Pact
       def tear_down_provider_state provider_state_name, consumer, options = {}
         Pact.configuration.provider_state_tear_down.call(provider_state_name, consumer, options)
       end
+
+      def set_metadata example, key, value
+        Pact::RSpec.with_rspec_3 do
+          example.metadata[key] = value
+        end
+
+        Pact::RSpec.with_rspec_2 do
+          example.example.metadata[key] = value
+        end
+      end
     end
   end
 end

data/lib/pact/provider/verification_results/create.rb

@@ -47,7 +47,8 @@ module Pact
         end
 
         def all_interactions_count
-          pact_source.pact_hash['interactions'].count
+          interactions = (pact_source.pact_hash['interactions'] || pact_source.pact_hash['messages'])
+          interactions ? interactions.count : 0
         end
 
         def test_results_hash_for_pact_uri

data/lib/pact/version.rb

@@ -1,4 +1,4 @@
 # Remember to bump pact-provider-proxy when this changes major version
 module Pact
-  VERSION = "1.21.0"
+  VERSION = "1.22.0"
 end

data/pact.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'webrick'
   gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
 
-  gem.add_runtime_dependency 'pact-support', '~> 1.3'
+  gem.add_runtime_dependency 'pact-support', '~> 1.4'
   gem.add_runtime_dependency 'pact-mock_service', '~> 2.0'
 
   gem.add_development_dependency 'rake', '~> 10.0.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.22.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-18 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -124,14 +124,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: pact-mock_service
   requirement: !ruby/object:Gem::Requirement