pact 1.55.2 → 1.55.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5bc7edfd2afca203239799e173f2245076887f4d38df625bbaec1ddfc655fda
-  data.tar.gz: c71945880bf5878c9e712b67f5b87262b7f72444b1628c12dc8eaec725022653
+  metadata.gz: 4f71267ea4f41559d9018867801a0090ed05c50c7f0082a015f7a5cb07e6c520
+  data.tar.gz: 86d8aad2e1544b5d3f20485acf3b32f19e4c8cff17595b3ed98a02494fd57a10
 SHA512:
-  metadata.gz: b8d062c28996f29d6424577b3514baa14510b546d3d914abd8d3d12ad2c626cef82a4dd6a7251b2d05fd3fa1c593e2d86862d3dac1b91c7e6757e9b7d7eaf9d7
-  data.tar.gz: 73feb7558cec7e7dc0b78469951c79a0313e0df86d7c85a677963a499c633b2e0d0877783f57ac2b141bb612cf0de8f9474eb5ccf5c8e7d5d2465d22ae16b73f
+  metadata.gz: d1f9b0b4d3e498af7d7c3c3036fb775b3c70b01117892e33f8e210ad0e97ccfa0f7c659792a1807b4871a65c14be887e49b2c5721d137ec85f28d2b9cf99e552
+  data.tar.gz: b3c35a1ca8672e9669f80ca1fa5684b1b6d9f24d0e33e3adab59c27c0687a0bd37f0ee21e75d8ff4284f25a596faec3633a39ea7cce6a50b56cafb705dd4656f

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+<a name="v1.55.3"></a>
+### v1.55.3 (2020-09-28)
+
+#### Bug Fixes
+
+* correct logic for determining if all interactions for a pact have been verified	 ([c4f968e](/../../commit/c4f968e))
+* de-duplicate re-run commands	 ([0813498](/../../commit/0813498))
+
 <a name="v1.55.2"></a>
 ### v1.55.2 (2020-09-26)
 

data/lib/pact/provider/pact_source.rb

@@ -1,6 +1,7 @@
 require 'pact/consumer_contract/pact_file'
 require 'pact/hal/http_client'
 require 'pact/hal/entity'
+require 'pact/consumer_contract'
 
 module Pact
   module Provider
@@ -24,6 +25,10 @@ module Pact
         uri.metadata[:pending]
       end
 
+      def consumer_contract
+        @consumer_contract ||= Pact::ConsumerContract.from_json(pact_json)
+      end
+
       def hal_entity
         http_client_keys = [:username, :password, :token]
         http_client_options = uri.options.reject{ |k, _| !http_client_keys.include?(k) }

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

@@ -128,7 +128,7 @@ module Pact
         def interaction_rerun_commands examples
           examples.collect do |example|
             interaction_rerun_command_for example
-          end.compact
+          end.compact.uniq
         end
 
         def interaction_unique_key(example)

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

@@ -28,7 +28,23 @@ module Pact
         end
 
         def publishable?
-          executed_interactions_count == all_interactions_count && all_interactions_count > 0
+          if defined?(@publishable)
+            @publishable
+          else
+            @publishable = pact_source.consumer_contract.interactions.all? do | interaction |
+              examples_for_pact_uri.any?{ |e| example_is_for_interaction?(e, interaction) }
+            end && examples_for_pact_uri.count > 0
+          end
+        end
+
+        def example_is_for_interaction?(example, interaction)
+          # Use the Pact Broker id if supported
+          if interaction._id
+            example[:pact_interaction]._id == interaction._id
+          else
+            # fall back to object equality (based on the field values of the interaction)
+            example[:pact_interaction] == interaction
+          end
         end
 
         def examples_for_pact_uri
@@ -39,18 +55,6 @@ module Pact
           examples_for_pact_uri.count{ |e| e[:status] != 'passed' }
         end
 
-        def executed_interactions_count
-          examples_for_pact_uri
-            .collect { |e| e[:pact_interaction].object_id }
-            .uniq
-            .count
-        end
-
-        def all_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
           {
             tests: examples_for_pact_uri.collect{ |e| clean_example(e) },

data/lib/pact/version.rb

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

data/pact.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'webrick', '~> 1.3'
   gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
 
-  gem.add_runtime_dependency 'pact-support', '~> 1.9'
+  gem.add_runtime_dependency 'pact-support', '~> 1.15'
   gem.add_runtime_dependency 'pact-mock_service', '~> 3.0', '>= 3.3.1'
 
   gem.add_development_dependency 'rake', '~> 13.0'
@@ -43,6 +43,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'faraday', '~> 0.13'
   gem.add_development_dependency 'conventional-changelog', '~> 1.3'
   gem.add_development_dependency 'bump', '~> 0.5'
-  gem.add_development_dependency 'pact-message', '~> 0.6'
+  gem.add_development_dependency 'pact-message', '~> 0.8'
   gem.add_development_dependency 'rspec-its', '~> 1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.55.2
+  version: 1.55.3
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: pact-mock_service
   requirement: !ruby/object:Gem::Requirement
@@ -248,14 +248,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement