pact 1.49.0 → 1.50.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d23bb31e12922ffa6334faa9105770afc780d97310296dd48f120613e12cee63
-  data.tar.gz: 89178f9552aabbf8099e65f3a10864303f53370b7ea76f841be6401d5667a66d
+  metadata.gz: 5b098430ba170a2290f1ae9c18b8d94ea7c2e968f5e8f3bd48c4e34155b4ea0d
+  data.tar.gz: 3b5f51717c2ba8934df7bf0fdbe9d68c74096e0058eeeae4f75804becd8366f3
 SHA512:
-  metadata.gz: 0a1f2a19a89eacda8db9a85b08d538821bf8ff25986ea6e8d5df4b84ea798bd41dd9136b6a0f894b3a513bf538055b734d7335d585279653822c81e3bfb49fb0
-  data.tar.gz: e9b962314733660dd23127eab1076abda1391000de6d9f0f647fbdb5353cc37c79c6c308be6e04c16d9b1e5e341a38ea531f6e6fa7174852edbcb5f4c9dfc46e
+  metadata.gz: '0049d4e11c748ebf653da1a754168d82198c73975cd30d16a67a4bcd837490740a30271b16a012612d19100b0a1c7139b5945e5f29686930407436a0acb47584'
+  data.tar.gz: 8e2e895e155d37650d5d677f062c9a4d391132beae3884144978cd41438bfa4c979caa33fc2a2623013b23cdd1c67e403d5506b84ed32def9c22be5e5a97f568

data/CHANGELOG.md

@@ -1,3 +1,49 @@
+<a name="v1.50.1"></a>
+### v1.50.1 (2020-06-15)
+
+
+#### Bug Fixes
+
+* fix integration with pact-message-ruby (#216)	 ([d2da13e](/../../commit/d2da13e))
+
+
+<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)
 

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/configuration/message_provider_dsl.rb

@@ -22,6 +22,33 @@ module Pact
         end
 
         dsl do
+          def app &block
+            self.app_block = block
+          end
+
+          def app_version application_version
+            self.application_version = application_version
+          end
+
+          def app_version_tags tags
+            self.tags = tags
+          end
+
+          def publish_verification_results publish_verification_results
+            self.publish_verification_results = publish_verification_results
+            Pact::RSpec.with_rspec_2 do
+              Pact.configuration.error_stream.puts "WARN: Publishing of verification results is currently not supported with rspec 2. If you would like this functionality, please feel free to submit a PR!"
+            end
+          end
+
+          def honours_pact_with consumer_name, options = {}, &block
+            create_pact_verification consumer_name, options, &block
+          end
+
+          def honours_pacts_from_pact_broker &block
+            create_pact_verification_from_broker &block
+          end
+
           def builder &block
             self.app_block = lambda { RackToMessageAdapter.new(block)  }
           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.49.0"
+  VERSION = "1.50.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.49.0
+  version: 1.50.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-06-15 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