pact 1.46.1 → 1.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25ae3362c392a7deab31b4273d9d35c954822fc5e67febdccd318239831be087
-  data.tar.gz: 89de14252d7225f678881afff334c501a2cfc1e39c191cf3b5a4da9c642c97da
+  metadata.gz: baf86f2efd8ed6641172f514a29fc1493e79cfb291c516a8c4059d94f778d58e
+  data.tar.gz: 264598f33c4561cd0ce013a8371d27fbb05855c392d762827a002dd0ab4240de
 SHA512:
-  metadata.gz: cf708ab7cbebbf0dbb0df3bc196ee5bd9818218c2dd925f73f59055bf1d05fea698731b6ac2d510098eea48f05b02c49b9f7492e2a9f6cfb3064ebb8524dc7bf
-  data.tar.gz: 223a6ed21f94fdd178794af79eb6f47371aa66e85b5f7e19140a2e51a6fcaf7cc71dfae9f1c965162bd0a8b0b1a82dff0c699a4582a1747e3ebd7e2dd17bd9f7
+  metadata.gz: e12522bd3471bb2268ab523a50d7198f8ce8c60ea78031e2f01533628d8c16b11352ceb52e17b879f5306b9b5ce3ab06ef4af9ee1fa2b8abf13a4a74847732de
+  data.tar.gz: f8d1e0d854deebf0451c65419e142a48ff1e8ded5cf2a0404ef06929520b77a68e20000c06209aac607fa58d3cbb86af4fb252fe2cf334ee4202aad4919578a8

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v1.47.0"></a>
+### v1.47.0 (2020-02-08)
+
+
+#### Features
+
+* update json formatter output	 ([376e47a](/../../commit/376e47a))
+* add pact metadata to json formatter	 ([6c6ddb8](/../../commit/6c6ddb8))
+
+
 <a name="v1.46.1"></a>
 ### v1.46.1 (2020-01-22)
 

data/lib/pact/pact_broker/fetch_pact_uris_for_verification.rb

@@ -3,6 +3,7 @@ require 'pact/hal/http_client'
 require 'pact/provider/pact_uri'
 require 'pact/errors'
 require 'pact/pact_broker/fetch_pacts'
+require 'pact/pact_broker/notices'
 
 module Pact
   module PactBroker
@@ -51,7 +52,8 @@ module Pact
         pacts_for_verification_entity.response.body[EMBEDDED][PACTS].collect do | pact |
           metadata = {
             pending: pact["verificationProperties"]["pending"],
-            notices: extract_notices(pact)
+            notices: extract_notices(pact),
+            short_description: pact["shortDescription"]
           }
           Pact::Provider::PactURI.new(pact[LINKS][SELF][HREF], http_client_options, metadata)
         end
@@ -69,11 +71,12 @@ module Pact
         q["includePendingStatus"] = true if options[:include_pending_status]
         q["consumerVersionSelectors"] = consumer_version_selectors if consumer_version_selectors.any?
         q["providerVersionTags"] = provider_version_tags if provider_version_tags.any?
+        q["includeWipPactsSince"] = options[:include_wip_pacts_since] if options[:include_wip_pacts_since]
         q
       end
 
       def extract_notices(pact)
-        (pact["verificationProperties"]["notices"] || []).collect{ |notice| symbolize_keys(notice) }.compact
+        Notices.new((pact["verificationProperties"]["notices"] || []).collect{ |notice| symbolize_keys(notice) })
       end
 
       def symbolize_keys(hash)
@@ -82,15 +85,15 @@ module Pact
 
       def log_message
         latest = consumer_version_selectors.any? ? "" : "latest "
-        message = "INFO: Fetching #{latest}pacts for #{provider} from #{broker_base_url}"
+        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" : "latest"
+            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 << " for tags: #{desc}"
+          message << ": #{desc}"
         end
         Pact.configuration.output_stream.puts message
       end

data/lib/pact/pact_broker/notices.rb

@@ -0,0 +1,34 @@
+module Pact
+  module PactBroker
+    class Notices < Array
+      def before_verification_notices
+        select { | notice | notice[:when].nil? || notice[:when].start_with?('before_verification') }
+      end
+
+      def before_verification_notices_text
+        before_verification_notices.collect{ | notice | notice[:text] }
+      end
+
+      def after_verification_notices(success, published)
+        select { | notice | notice[:when] == "after_verification:success_#{success}_published_#{published}" || notice[:when] == "after_verification" }
+          .collect do | notice |
+            notice.merge(:when => simplify_notice_when(notice[:when]))
+          end
+      end
+
+      def after_verification_notices_text(success, published)
+        after_verification_notices(success, published).collect{ | notice | notice[:text] }
+      end
+
+      def all_notices(success, published)
+        before_verification_notices + after_verification_notices(success, published)
+      end
+
+      private
+
+      def simplify_notice_when(when_key)
+        when_key.split(":").first
+      end
+    end
+  end
+end

data/lib/pact/provider/pact_source.rb

@@ -6,7 +6,7 @@ module Pact
   module Provider
     class PactSource
 
-      attr_reader :uri
+      attr_reader :uri # PactURI class
 
       def initialize uri
         @uri = uri

data/lib/pact/provider/pact_spec_runner.rb

@@ -122,7 +122,7 @@ module Pact
             ignore_failures: options[:ignore_failures],
             request_customizer: options[:request_customizer]
           }
-          honour_pactfile pact_source.uri, ordered_pact_json(pact_source.pact_json), spec_options
+          honour_pactfile pact_source, ordered_pact_json(pact_source.pact_json), spec_options
         end
       end
 

data/lib/pact/provider/rspec.rb

@@ -21,16 +21,20 @@ module Pact
 
         include ::RSpec::Core::DSL
 
-        def honour_pactfile pact_uri, pact_json, options
+        def honour_pactfile pact_source, pact_json, options
+          pact_uri = pact_source.uri
           Pact.configuration.output_stream.puts "INFO: Reading pact at #{pact_uri}"
-          (pact_uri.metadata[:notices] || EMPTY_ARRAY).each do | notice |
-            Pact.configuration.output_stream.puts("DEBUG: #{notice[:text]}")
+          if pact_uri.metadata[:notices]
+            pact_uri.metadata[:notices].before_verification_notices_text.each do | text |
+              Pact.configuration.output_stream.puts("DEBUG: #{text}")
+            end
           end
+
           Pact.configuration.output_stream.puts "DEBUG: Filtering interactions by: #{options[:criteria]}" if options[:criteria] && options[:criteria].any?
           consumer_contract = Pact::ConsumerContract.from_json(pact_json)
           suffix = pact_uri.metadata[:pending] ? " [PENDING]": ""
           ::RSpec.describe "Verifying a pact between #{consumer_contract.consumer.name} and #{consumer_contract.provider.name}#{suffix}", pactfile_uri: pact_uri do
-            honour_consumer_contract consumer_contract, options.merge(pact_json: pact_json, pact_uri: pact_uri)
+            honour_consumer_contract consumer_contract, options.merge(pact_json: pact_json, pact_uri: pact_uri, pact_source: pact_source, consumer_contract: consumer_contract)
           end
         end
 
@@ -78,7 +82,9 @@ module Pact
             pact_interaction: interaction,
             pact_interaction_example_description: interaction_description_for_rerun_command(interaction),
             pact_uri: options[:pact_uri],
-            pact_ignore_failures: options[:pact_uri].metadata[:pending] || options[:ignore_failures]
+            pact_source: options[:pact_source],
+            pact_ignore_failures: options[:pact_uri].metadata[:pending] || options[:ignore_failures],
+            pact_consumer_contract: options[:consumer_contract]
           }
 
           describe description_for(interaction), metadata do

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

@@ -8,19 +8,21 @@ module Pact
 
         def dump_summary(summary)
           super(create_custom_summary(summary))
-          output_hash[:summary][:notices] = pact_broker_notices(summary)
+          output_hash[:summary][:pacts] = pacts(summary)
         end
 
         def format_example(example)
           {
             :id => example.id,
+            :interaction_index => example.metadata[:pact_interaction].index,
             :description => example.description,
             :full_description => example.full_description,
             :status => calculate_status(example),
             :file_path => example.metadata[:file_path],
             :line_number  => example.metadata[:line_number],
             :run_time => example.execution_result.run_time,
-            :mismatches => extract_differences(example)
+            :mismatches => extract_differences(example),
+            :pact_url => example.metadata[:pact_uri].uri
           }
         end
 
@@ -54,12 +56,22 @@ module Pact
         # If the JSON formatter is used by someone else and they have multiple pacts, all the notices
         # for the pacts will be mushed together in one collection, so it will be hard to know which notice
         # belongs to which pact.
-        def pact_broker_notices(summary)
-          pact_uris(summary).collect{ |pact_uri| pact_uri.metadata[:notices] }.compact.flatten
+        def pacts(summary)
+          unique_pact_metadatas(summary).collect do | example_metadata |
+            pact_uri = example_metadata[:pact_uri]
+            notices = (pact_uri.metadata[:notices] && pact_uri.metadata[:notices].before_verification_notices) || []
+            {
+              notices: notices,
+              url: pact_uri.uri,
+              consumer_name: example_metadata[:pact_consumer_contract].consumer.name,
+              provider_name: example_metadata[:pact_consumer_contract].provider.name,
+              short_description: pact_uri.metadata[:short_description]
+            }
+          end
         end
 
-        def pact_uris(summary)
-          summary.examples.collect(&:metadata).collect{ |metadata| metadata[:pact_uri] }.uniq
+        def unique_pact_metadatas(summary)
+          summary.examples.collect(&:metadata).group_by{ | metadata | metadata[:pact_uri].uri }.values.collect(&:first)
         end
 
         def create_custom_summary(summary)

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

@@ -33,6 +33,9 @@ module Pact
           if can_publish_verification_results?
             tag_versions_if_configured
             publish_verification_results
+            true
+          else
+            false
           end
         end
 

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

@@ -17,7 +17,12 @@ module Pact
 
         def call
           verification_results.collect do | (pact_source, verification_result) |
-            Publish.call(pact_source, verification_result)
+            published = false
+            begin
+              published = Publish.call(pact_source, verification_result)
+            ensure
+              print_after_verification_notices(pact_source, verification_result, published)
+            end
           end
         end
 
@@ -29,6 +34,14 @@ module Pact
           end
         end
 
+        def print_after_verification_notices(pact_source, verification_result, published)
+          if pact_source.uri.metadata[:notices]
+            pact_source.uri.metadata[:notices].after_verification_notices_text(verification_result.success, published).each do | text |
+              Pact.configuration.output_stream.puts "DEBUG: #{text}"
+            end
+          end
+        end
+
         attr_reader :pact_sources, :test_results_hash
       end
     end

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

@@ -4,6 +4,7 @@ module Pact
   module Provider
     module VerificationResults
       class VerificationResult
+        attr_reader :success, :provider_application_version, :test_results_hash
 
         def initialize publishable, success, provider_application_version, test_results_hash
           @publishable = publishable
@@ -31,10 +32,6 @@ module Pact
         def to_s
           "[success: #{success}, providerApplicationVersion: #{provider_application_version}]"
         end
-
-        private
-
-        attr_reader :success, :provider_application_version, :test_results_hash
       end
     end
   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.46.1"
+  VERSION = "1.47.0"
 end

data/pact.gemspec

@@ -44,4 +44,5 @@ Gem::Specification.new do |gem|
   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 'rspec-its', '~> 1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.46.1
+  version: 1.47.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -250,6 +250,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: Enables consumer driven contract testing, providing a mock service and
   DSL for the consumer project, and interaction playback and verification for the
   service provider project.
@@ -304,6 +318,7 @@ files:
 - lib/pact/pact_broker.rb
 - 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/project_root.rb
 - lib/pact/provider.rb
 - lib/pact/provider/configuration.rb