pact 1.48.0 → 1.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf71975a44b67d9faeb43a80011d0ead09414a0effc2ae080036ebd44e0d8c2d
-  data.tar.gz: 2161386666d724d2cebf7c1dda996880072c89046f3296f1bc1cffd178b0f259
+  metadata.gz: 72dbb710ec5471bb551465a8f55342f32cc057cb2a6d36a7f1b4ec613e90fb19
+  data.tar.gz: b0c3329c670d4704517df5eeb79b4cbb8d874c2a52151851009a211d3ab89d36
 SHA512:
-  metadata.gz: a753e3b4f884b640707600f948c83e5f4a99bf8d9d3c5250f28aa9b6f11b5aed3154aa9459bad25dc17e96be1ace9b25944b46a69076a5d2734ab18a1711f90e
-  data.tar.gz: a6dc4d42755cde3d2c94e3a0a1bb5c6405db7c4397744a0800bb1fea9d5764365ef60d47e474c4b3c037029531762ddcbd0da6940e931b15b0fe4650a6902ef1
+  metadata.gz: 8a4fed394938fb5ad9489f79df8b06589d5982cc289cf45fd0c8a5056a23b875b48be9efb3b082e34477935ffbc7b7416a1de5daa9183bf9c2dbd20ba548f503
+  data.tar.gz: b8b501317bb1e1446d1776c7c3d9e5674632475cae4cbd4a5e38f726c374463a23000f95760e432c48cc3cee46fd74dbff17dae6226d5f614f4972f4938a2df2

data/CHANGELOG.md

@@ -1,3 +1,49 @@
+<a name="v1.50.0"></a>
+### v1.50.0 (2020-04-25)
+
+
+#### Features
+
+* Set expected interactions on mock service but without writing them to pact file (#210)	 ([14f5327](/../../commit/14f5327))
+
+
+<a name="v1.49.3"></a>
+### v1.49.3 (2020-04-22)
+
+
+#### Bug Fixes
+
+* pact selection verification options logging	 ([9ff59f4](/../../commit/9ff59f4))
+
+
+<a name="v1.49.2"></a>
+### v1.49.2 (2020-04-08)
+
+
+#### Bug Fixes
+
+* json parser error for top level JSON values	 ([dafbc35](/../../commit/dafbc35))
+
+
+<a name="v1.49.1"></a>
+### v1.49.1 (2020-03-21)
+
+
+#### Bug Fixes
+
+* ensure diff is included in the json output	 ([0bd9753](/../../commit/0bd9753))
+* ensure the presence of basic auth credentials does not cause an error when displaying the path of a pact on the local filesystem	 ([f6a0b4d](/../../commit/f6a0b4d))
+
+
+<a name="v1.49.0"></a>
+### v1.49.0 (2020-02-18)
+
+
+#### Features
+
+* use environment variables PACT_BROKER_USERNAME and PACT_BROKER_PASSWORD when verifying a pact by URL, if the environment variables are present	 ([308f25d](/../../commit/308f25d))
+
+
 <a name="v1.48.0"></a>
 ### v1.48.0 (2020-02-13)
 

data/lib/pact/cli/run_pact_verification.rb

@@ -56,9 +56,11 @@ module Pact
 
       def run_with_pact_url_string
         pact_repository_uri_options = {}
+        pact_repository_uri_options[:username] = ENV['PACT_BROKER_USERNAME'] if ENV['PACT_BROKER_USERNAME']
+        pact_repository_uri_options[:password] = ENV['PACT_BROKER_PASSWORD'] if ENV['PACT_BROKER_PASSWORD']
+        pact_repository_uri_options[:token] = ENV['PACT_BROKER_TOKEN']
         pact_repository_uri_options[:username] = options[:pact_broker_username] if options[:pact_broker_username]
         pact_repository_uri_options[:password] = options[:pact_broker_password] if options[:pact_broker_password]
-        pact_repository_uri_options[:token] = ENV['PACT_BROKER_TOKEN']
         pact_uri = ::Pact::Provider::PactURI.new(options[:pact_uri], pact_repository_uri_options)
         Pact::Provider::PactSpecRunner.new([pact_uri], pact_spec_options).run
       end

data/lib/pact/consumer/consumer_contract_builder.rb

@@ -25,6 +25,10 @@ module Pact
         @mock_service_base_url = "http://#{attributes[:host]}:#{attributes[:port]}"
       end
 
+      def without_writing_to_pact
+        interaction_builder.without_writing_to_pact
+      end
+
       def given(provider_state)
         interaction_builder.given(provider_state)
       end

data/lib/pact/consumer/interaction_builder.rb

@@ -13,6 +13,12 @@ module Pact
         @callback = block
       end
 
+      def without_writing_to_pact
+        interaction.metadata ||= {}
+        interaction.metadata[:write_to_pact] = false
+        self
+      end
+
       def upon_receiving description
         @interaction.description = description
         self

data/lib/pact/pact_broker/fetch_pact_uris_for_verification.rb

@@ -4,10 +4,12 @@ require 'pact/provider/pact_uri'
 require 'pact/errors'
 require 'pact/pact_broker/fetch_pacts'
 require 'pact/pact_broker/notices'
+require 'pact/pact_broker/pact_selection_description'
 
 module Pact
   module PactBroker
     class FetchPactURIsForVerification
+      include PactSelectionDescription
       attr_reader :provider, :consumer_version_selectors, :provider_version_tags, :broker_base_url, :http_client_options, :http_client, :options
 
       PACTS_FOR_VERIFICATION_RELATION = 'beta:provider-pacts-for-verification'.freeze
@@ -84,18 +86,7 @@ module Pact
       end
 
       def log_message
-        latest = consumer_version_selectors.any? ? "" : "latest "
-        message = "INFO: Fetching pacts for #{provider} from #{broker_base_url} with the selection criteria: "
-        if consumer_version_selectors.any?
-          desc = consumer_version_selectors.collect do |selector|
-            all_or_latest = selector[:all] ? "all for tag" : "latest for tag"
-            # TODO support fallback
-            name = selector[:fallback] ? "#{selector[:tag]} (or #{selector[:fallback]} if not found)" : selector[:tag]
-            "#{all_or_latest} #{name}"
-          end.join(", ")
-          message << ": #{desc}"
-        end
-        Pact.configuration.output_stream.puts message
+        Pact.configuration.output_stream.puts "INFO: #{pact_selection_description(provider, consumer_version_selectors, options, broker_base_url)}"
       end
     end
   end

data/lib/pact/pact_broker/pact_selection_description.rb

@@ -0,0 +1,24 @@
+module Pact
+  module PactBroker
+    module PactSelectionDescription
+      def pact_selection_description(provider, consumer_version_selectors, options, broker_base_url)
+        latest = consumer_version_selectors.any? ? "" : "latest "
+        message = "Fetching pacts for #{provider} from #{broker_base_url} with the selection criteria: "
+        if consumer_version_selectors.any?
+          desc = consumer_version_selectors.collect do |selector|
+            all_or_latest = !selector[:latest] ? "all for tag" : "latest for tag"
+            # TODO support fallback
+            fallback = selector[:fallback] || selector[:fallbackTag]
+            name = fallback ? "#{selector[:tag]} (or #{fallback} if not found)" : selector[:tag]
+            "#{all_or_latest} #{name}"
+          end.join(", ")
+          if options[:include_wip_pacts_since]
+            desc = "#{desc}, work in progress pacts created after #{options[:include_wip_pacts_since]}"
+          end
+          message << "#{desc}"
+        end
+        message
+      end
+    end
+  end
+end

data/lib/pact/provider/pact_uri.rb

@@ -29,10 +29,10 @@ module Pact
       end
 
       def to_s
-        if(basic_auth?)
+        if basic_auth? && uri.start_with?('http://', 'https://')
           URI(@uri).tap { |x| x.userinfo="#{username}:*****"}.to_s
         else
-          @uri
+          uri
         end
       end
     end

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

@@ -30,13 +30,15 @@ module Pact
           output_hash[:examples] = notification.examples.map do |example|
             format_example(example).tap do |hash|
               e = example.exception
-              # No point providing a backtrace for a mismatch, too much noise
-              if e && ! e.is_a?(::RSpec::Expectations::ExpectationNotMetError)
+              if e
                 hash[:exception] =  {
-                  :class => e.class.name,
-                  :message => e.message,
-                  :backtrace => e.backtrace,
+                  class: e.class.name,
+                  message: e.message,
                 }
+                # No point providing a backtrace for a mismatch, too much noise
+                if !e.is_a?(::RSpec::Expectations::ExpectationNotMetError)
+                  hash[:exception][:backtrace]
+                end
               end
             end
           end

data/lib/pact/provider/test_methods.rb

@@ -29,7 +29,9 @@ module Pact
       def parse_body_from_response rack_response
         case rack_response.headers['Content-Type']
         when /json/
-          JSON.load(rack_response.body)
+          # For https://github.com/pact-foundation/pact-net/issues/237
+          # Only required for the pact-ruby-standalone ¯\_(ツ)_/¯
+          JSON.load("[#{rack_response.body}]").first
         else
           rack_response.body
         end

data/lib/pact/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.48.0
+  version: 1.50.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -319,6 +319,7 @@ files:
 - lib/pact/pact_broker/fetch_pact_uris_for_verification.rb
 - lib/pact/pact_broker/fetch_pacts.rb
 - lib/pact/pact_broker/notices.rb
+- lib/pact/pact_broker/pact_selection_description.rb
 - lib/pact/project_root.rb
 - lib/pact/provider.rb
 - lib/pact/provider/configuration.rb