pact 1.55.0 → 1.55.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54f6d8684eb57457977a86f79a9e2aace62f2fe63ef1e3896e8beee31586b0fe
-  data.tar.gz: 292f5bdfe8cf126faaaab4a1792b1e68a21484f32a311fc9a5053f9a64f00f04
+  metadata.gz: b5bc7edfd2afca203239799e173f2245076887f4d38df625bbaec1ddfc655fda
+  data.tar.gz: c71945880bf5878c9e712b67f5b87262b7f72444b1628c12dc8eaec725022653
 SHA512:
-  metadata.gz: 2501e2bb9ea36e185d45816d1944718fca0b0ebab315f7c51557553f85c809c96cb2a20d09096a326be108eafef352e6d41d2cc018369b3422f162bcc8fe7696
-  data.tar.gz: d08e959aa8220f31b0fc8e60b82e9dda9f367f04604db7d26bdef16304b8862f45679e9333e49646d157e292ca03ef98fd94cb221723c7aee988539d0cc8540d
+  metadata.gz: b8d062c28996f29d6424577b3514baa14510b546d3d914abd8d3d12ad2c626cef82a4dd6a7251b2d05fd3fa1c593e2d86862d3dac1b91c7e6757e9b7d7eaf9d7
+  data.tar.gz: 73feb7558cec7e7dc0b78469951c79a0313e0df86d7c85a677963a499c633b2e0d0877783f57ac2b141bb612cf0de8f9474eb5ccf5c8e7d5d2465d22ae16b73f

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+<a name="v1.55.2"></a>
+### v1.55.2 (2020-09-26)
+
+#### Bug Fixes
+
+* correctly calculate exit code when a mix of pending and non pending pacts are verified	 ([533faa1](/../../commit/533faa1))
+
+<a name="v1.55.1"></a>
+### v1.55.1 (2020-09-26)
+
+#### Bug Fixes
+
+* remove accidentally committed debug logging	 ([081423e](/../../commit/081423e))
+
 <a name="v1.55.0"></a>
 ### v1.55.0 (2020-09-26)
 

data/lib/pact/provider/pact_source.rb

@@ -20,6 +20,10 @@ module Pact
         @pact_hash ||= JSON.load(pact_json, nil, { max_nesting: 50 })
       end
 
+      def pending?
+        uri.metadata[:pending]
+      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/pact_spec_runner.rb

@@ -11,6 +11,7 @@ require 'pact/provider/verification_results/publish_all'
 require 'pact/provider/rspec/pact_broker_formatter'
 require 'pact/provider/rspec/json_formatter'
 require 'pact/provider/rspec'
+require 'pact/provider/rspec/calculate_exit_code'
 
 module Pact
   module Provider
@@ -79,6 +80,7 @@ module Pact
         executing_with_ruby = executing_with_ruby?
 
         config.after(:suite) do | suite |
+          Pact.provider_world.failed_examples = suite.reporter.failed_examples
           Pact::Provider::Help::Write.call(Pact.provider_world.pact_sources) if executing_with_ruby
         end
       end
@@ -90,7 +92,12 @@ module Pact
           ::RSpec::Core::CommandLine.new(NoConfigurationOptions.new)
             .run(::RSpec.configuration.output_stream, ::RSpec.configuration.error_stream)
         end
-        pending_mode? ? 0 : exit_code
+
+        if options[:ignore_failures]
+          0
+        else
+          Pact::Provider::RSpec::CalculateExitCode.call(pact_sources, Pact.provider_world.failed_examples)
+        end
       end
 
       def rspec_runner_options
@@ -147,8 +154,6 @@ module Pact
         end
 
         ::RSpec.configuration.full_backtrace = @options[:full_backtrace]
-
-        ::RSpec.configuration.failure_color = :yellow if pending_mode?
       end
 
       def ordered_pact_json(pact_json)
@@ -159,20 +164,12 @@ module Pact
         consumer_contract.to_json
       end
 
-      def all_pacts_pending?
-        pact_urls.all?{ | pact_url| pact_url.metadata[:pending] }
-      end
-
       def class_exists? name
         Kernel.const_get name
       rescue NameError
         false
       end
 
-      def pending_mode?
-        (all_pacts_pending? || options[:ignore_failures])
-      end
-
       def executing_with_ruby?
         ENV['PACT_EXECUTING_LANGUAGE'] == 'ruby'
       end

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

@@ -0,0 +1,18 @@
+module Pact
+  module Provider
+    module RSpec
+      module CalculateExitCode
+        def self.call(pact_sources, failed_examples)
+          any_non_pending_failures = pact_sources.any? do |pact_source|
+            if pact_source.pending?
+              nil
+            else
+              failed_examples.select { |e| e.metadata[:pact_source] == pact_source }.any?
+            end
+          end
+          any_non_pending_failures ? 1 : 0
+        end
+      end
+    end
+  end
+end

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

@@ -65,10 +65,6 @@ module Pact
           pending_interaction_examples(summary).size
         end
 
-        def ignore_failures?(summary)
-          summary.failed_examples.any?{ |e| e.metadata[:pact_ignore_failures] }
-        end
-
         def failure_title summary
           ::RSpec::Core::Formatters::Helpers.pluralize(failed_interactions_count(summary), "failure")
         end
@@ -96,12 +92,14 @@ module Pact
             interaction_rerun_commands(pending_interaction_examples(summary)).each do | message |
               output.puts(message)
             end
+            set_rspec_failure_color(:red)
           end
 
-          set_rspec_failure_color(:red)
-          output.puts("\nFailed interactions:\n\n")
-          interaction_rerun_commands(failed_interaction_examples(summary)).each do | message |
-            output.puts(message)
+          if failed_interactions_count(summary) > 0
+            output.puts("\nFailed interactions:\n\n")
+            interaction_rerun_commands(failed_interaction_examples(summary)).each do | message |
+              output.puts(message)
+            end
           end
         end
 

data/lib/pact/provider/rspec.rb

@@ -89,7 +89,7 @@ module Pact
             pact_interaction_example_description: interaction_description_for_rerun_command(interaction),
             pact_uri: options[:pact_uri],
             pact_source: options[:pact_source],
-            pact_ignore_failures: options[:pact_uri].metadata[:pending] || options[:ignore_failures],
+            pact_ignore_failures: options[:pact_source].pending? || options[:ignore_failures],
             pact_consumer_contract: options[:consumer_contract],
             pact_criteria: options[:criteria]
           }
@@ -100,9 +100,6 @@ module Pact
             pact_context = options[:pact_context]
 
             before do | example |
-              pact_context.run_once :before do
-                ::RSpec.configuration.reporter.message "THIS IS A PACT"
-              end
               interaction_context.run_once :before do
                 Pact.configuration.logger.info "Running example '#{Pact::RSpec.full_description(example)}'"
                 set_up_provider_states interaction.provider_states, options[:consumer]

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

@@ -81,7 +81,7 @@ module Pact
             Pact.configuration.output_stream.puts "INFO: Tagging version #{provider_application_version} of #{provider_name} as #{tag.inspect}"
             tag_entity = tag_link.expand(version: provider_application_version, tag: tag).put
             unless tag_entity.success?
-              raise PublicationError.new("Error returned from tagging request #{tag_entity.response.code} #{tag_entity.response.body}")
+              raise PublicationError.new("Error returned from tagging request: status=#{tag_entity.response.code} body=#{tag_entity.response.body}")
             end
           end
         end

data/lib/pact/provider/world.rb

@@ -14,7 +14,7 @@ module Pact
   module Provider
     class World
 
-      attr_accessor :pact_sources
+      attr_accessor :pact_sources, :failed_examples
 
       def provider_states
         @provider_states_proxy ||= Pact::Provider::State::ProviderStateProxy.new

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.0"
+  VERSION = "1.55.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.55.0
+  version: 1.55.2
 platform: ruby
 authors:
 - James Fraser
@@ -352,6 +352,7 @@ files:
 - lib/pact/provider/request.rb
 - lib/pact/provider/rspec.rb
 - lib/pact/provider/rspec/backtrace_formatter.rb
+- lib/pact/provider/rspec/calculate_exit_code.rb
 - lib/pact/provider/rspec/custom_options_file
 - lib/pact/provider/rspec/formatter_rspec_2.rb
 - lib/pact/provider/rspec/formatter_rspec_3.rb