pact_broker 2.59.2 → 2.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1933f8f7902c43ed7d9db7c022a66f2569c6301dec2c8ac767e1da7b05f70b5
-  data.tar.gz: 40d82183c3a94b2bfc2bfa37a9aee12cc27729e1c3a1b3191df980c2ba3ad192
+  metadata.gz: dbaaee53f1641458eb110582a96bf0be98d7078ef1fa681ffee934c6e8007347
+  data.tar.gz: 84a2f6e6785acc85cf7053b86a54574746cb06de917bd11a0dff23403046aff5
 SHA512:
-  metadata.gz: 5078b560d3d0abe897572f35276b3aec1c6752026ba849a9b61517def382ea0d936731a6b2f59801b0101cab7bde636ef3e9e5e7afe9524e13c3def552f48ded
-  data.tar.gz: 6fc016ea9e10bcbad4f78d60b93a81b5d0aab2ffbfef9d222a094e0348f632680995bce488abe9fefe55cad745afafef323ce3c972db3e78a7e1f6759d222f6e
+  metadata.gz: de93223c0a1d52af6563bf31b2ae733c41b6cec65afb4a61be741d78f47cf18484ee2fa292c9660b8db09cb3a1a66c549decb145a0b7a036477a9ac73b70f8c6
+  data.tar.gz: 04d3a59551f4fe9f46af8b65cd6c0dc3326ac86a594298eb22d529e33f6a98e39cdf6f9c682bd69bd9bbb85f4f290fe3e2f706d71cfa766b61def28c0dbd7bfc

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+<a name="v2.60.0"></a>
+### v2.60.0 (2020-09-08)
+
+#### Features
+
+* **pacts for verification**
+  * add deprecation title to beta:provider-pacts-for-verification relation	 ([47a61f69](/../../commit/47a61f69))
+  * do not require environment variable feature toggle to enable feature	 ([7d0fe1ea](/../../commit/7d0fe1ea))
+  * allow consumer to be specified with fallback tags, and overall latest to be specified with or without a consumer	 ([2d52d173](/../../commit/2d52d173))
+
+#### Bug Fixes
+
+* correctly handle new test results format when merging test results with pact contents	 ([b35ab71b](/../../commit/b35ab71b))
+
 <a name="v2.59.2"></a>
 ### v2.59.2 (2020-08-06)
 

data/README.md

@@ -6,7 +6,7 @@
  [![Code Climate](https://codeclimate.com/github/pact-foundation/pact_broker/badges/gpa.svg)](https://codeclimate.com/github/pact-foundation/pact_broker)
  [![Test Coverage](https://codeclimate.com/github/pact-foundation/pact_broker/badges/coverage.svg)](https://codeclimate.com/github/pact-foundation/pact_broker/coverage)
 
-The Pact Broker is an application for sharing for consumer driven contracts and verification results. It is optimised for use with "pacts" (contracts created by the [Pact][pact-docs] framework), but can be used for any type of contract that can be serialized to JSON.
+The Pact Broker is an application for sharing of consumer driven contracts and verification results. It is optimised for use with "pacts" (contracts created by the [Pact][pact-docs] framework), but can be used for any type of contract that can be serialized to JSON.
 
 <br/>
 <a href="https:/pactflow.io/?utm_source=github&utm_campaign=pact_broker_intro"><img src="docs/images/Pactflow logo - black small.png"></a>

data/lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema.rb

@@ -1,5 +1,6 @@
 require 'dry-validation'
 require 'pact_broker/hash_refinements'
+require 'pact_broker/string_refinements'
 require 'pact_broker/api/contracts/dry_validation_workarounds'
 require 'pact_broker/api/contracts/dry_validation_predicates'
 
@@ -9,6 +10,7 @@ module PactBroker
       class VerifiablePactsJSONQuerySchema
         extend DryValidationWorkarounds
         using PactBroker::HashRefinements
+        using PactBroker::StringRefinements
 
         SCHEMA = Dry::Validation.Schema do
           configure do
@@ -24,7 +26,7 @@ module PactBroker
               #   end
               # end
 
-              required(:tag).filled(:str?)
+              optional(:tag).filled(:str?)
               optional(:latest).filled(included_in?: [true, false])
               optional(:fallbackTag).filled(:str?)
               optional(:consumer).filled(:str?, :not_blank?)
@@ -54,8 +56,9 @@ module PactBroker
                 errors << "fallbackTag can only be set if latest is true (at index #{index})"
               end
 
-              if selector[:consumer] && selector[:latest]
-                errors << "specifying a consumer with latest == true is not yet supported (at index #{index})"
+
+              if not_provided?(selector[:tag]) && selector[:latest] != true
+                errors << "latest must be true, or a tag must be provided (at index #{index})"
               end
             end
             if errors.any?
@@ -64,6 +67,10 @@ module PactBroker
             end
           end
         end
+
+        def self.not_provided?(value)
+          value.nil? || value.blank?
+        end
       end
     end
   end

data/lib/pact_broker/api/resources/index.rb

@@ -121,6 +121,17 @@ module PactBroker
               title: "Determine if an application can be safely deployed to an environment identified by the given tag",
               templated: true
             },
+            'pb:provider-pacts-for-verification' => {
+              href: base_url + '/pacts/provider/{provider}/for-verification',
+              title: 'Pact versions to be verified for the specified provider',
+              templated: true
+            },
+            'beta:provider-pacts-for-verification' => {
+              name: 'beta',
+              href: base_url + '/doc/{rel}?context=index',
+              title: 'DEPRECATED - please use pb:provider-pacts-for-verification',
+              templated: true
+            },
             'curies' =>
             [{
               name: 'pb',
@@ -133,14 +144,6 @@ module PactBroker
             }]
           }
 
-          if PactBroker.feature_enabled?(:pacts_for_verification)
-            links_hash['beta:provider-pacts-for-verification'] = {
-                href: base_url + '/pacts/provider/{provider}/for-verification',
-                title: 'Pact versions to be verified for the specified provider',
-                templated: true
-              }
-          end
-
           links_hash
         end
 

data/lib/pact_broker/api/resources/provider_pacts_for_verification.rb

@@ -1,6 +1,5 @@
 require 'pact_broker/api/resources/provider_pacts'
 require 'pact_broker/api/decorators/verifiable_pacts_decorator'
-require 'pact_broker/api/contracts/verifiable_pacts_query_schema'
 require 'pact_broker/api/decorators/verifiable_pacts_query_decorator'
 require 'pact_broker/api/contracts/verifiable_pacts_json_query_schema'
 require 'pact_broker/hash_refinements'
@@ -12,7 +11,7 @@ module PactBroker
         using PactBroker::HashRefinements
 
         def allowed_methods
-          ["GET", "POST", "OPTIONS"]
+          ["POST", "OPTIONS"]
         end
 
         def content_types_accepted
@@ -36,7 +35,7 @@ module PactBroker
         private
 
         def pacts
-          pact_service.find_for_verification(
+          @pacts ||= pact_service.find_for_verification(
             provider_name,
             parsed_query_params.provider_version_tags,
             parsed_query_params.consumer_version_selectors,
@@ -56,11 +55,7 @@ module PactBroker
         end
 
         def query_schema
-          if request.get?
-            PactBroker::Api::Contracts::VerifiablePactsQuerySchema
-          else
-            PactBroker::Api::Contracts::VerifiablePactsJSONQuerySchema
-          end
+          PactBroker::Api::Contracts::VerifiablePactsJSONQuerySchema
         end
 
         def parsed_query_params

data/lib/pact_broker/doc/views/provider-pacts-for-verification.markdown

@@ -0,0 +1,78 @@
+# Provider pacts for verification
+
+Path: `/pacts/provider/{provider}/for-verification`
+
+Allowed methods: `POST`
+
+Content type: `application/hal+json`
+
+Returns a deduplicated list of pacts to be verified by the specified provider.
+
+### Body
+
+Example: This data structure represents the way a user might specify "I want to verify the latest 'master' pact, all 'prod' pacts, and when I publish the verification results, I'm going to tag the provider version with 'master'"
+
+    {
+      "consumerVersionSelectors": [
+        {
+          "tag": "master",
+          "latest": true
+        },{
+          "tag": "prod"
+        }
+      ],
+      "providerVersionTags": ["master"],
+      "includePendingStatus": true,
+      "includeWipPactsSince": "2020-01-01"
+    }
+
+
+`consumerVersionSelectors.tag`: the tag name(s) of the consumer versions to get the pacts for.
+
+`consumerVersionSelectors.fallbackTag`: the name of the tag to fallback to if the specified `tag` does not exist. This is useful when the consumer and provider use matching branch names to coordinate the development of new features.
+
+`consumerVersionSelectors.latest`: true. If the latest flag is omitted, *all* the pacts with the specified tag will be returned. (This might seem a bit weird, but it's done this way to match the syntax used for the matrix query params. See https://docs.pact.io/selectors)
+
+`consumerVersionSelectors.consumer`: allows a selector to only be applied to a certain consumer. This is used when there is an API that has multiple consumers, one of which is a deployed service, and one of which is a mobile consumer. The deployed service only needs the latest production pact verified, where as the mobile consumer may want all the production pacts verified.
+
+`providerVersionTags`: the tag name(s) for the provider application version that will be published with the verification results. This is used by the Broker to determine whether or not a particular pact is in pending state or not. This parameter can be specified multiple times.
+
+`includePendingStatus`: true|false (default false). When true, a pending boolean will be added to the verificationProperties in the response, and an extra message will appear in the notices array to indicate why this pact is/is not in pending state. This will allow your code to handle the response based on only what is present in the response, and not have to do ifs based on the user's options together with the response. As requested in the "pacts for verification" issue, please print out these messages in the tests if possible. If not possible, perhaps create a separate task which will list the pact URLs and messages for debugging purposes.
+
+`includeWipPactsSince`: Date string. The date from which to include the "work in progress" pacts. See https://docs.pact.io/wip for more information on work in progress pacts.
+
+### Response body
+
+`pending` flag and  the "pending reason" notice will only be included if `includePendingStatus` is set to true.
+
+
+    {
+      "_embedded": {
+        "pacts": [
+          {
+            "verificationProperties": {
+              "notices": [
+                {
+                  "text": "This pact is being verified because it is the pact for the latest version of Foo tagged with 'dev'",
+                  "when": "before_verification"
+                }
+              ],
+              "pending": false
+            },
+            "_links": {
+              "self": {
+                "href": "http://localhost:9292/pacts/provider/Bar/consumer/Foo/pact-version/0e3369199f4008231946e0245474537443ccda2a",
+                "name": "Pact between Foo (v1.0.0) and Bar"
+              }
+            }
+          }
+        ]
+      },
+      "_links": {
+        "self": {
+          "href": "http://localhost:9292/pacts/provider/Bar/for-verification",
+          "title": "Pacts to be verified"
+        }
+      }
+    }
+

data/lib/pact_broker/domain/pact.rb

@@ -1,5 +1,6 @@
 require 'pact_broker/db'
 require 'pact_broker/json'
+require 'pact_broker/pacts/content'
 
 =begin
 This class most accurately represents a PactPublication
@@ -76,6 +77,14 @@ module PactBroker
         JSON.parse(json_content, PACT_PARSING_OPTIONS)
       end
 
+      def content_object
+        @content_object ||= begin
+          PactBroker::Pacts::Content.from_json(json_content)
+        rescue
+          PactBroker::Pacts::Content.new
+        end
+      end
+
       def pact_publication_id
         id
       end

data/lib/pact_broker/pacts/content.rb

@@ -39,9 +39,15 @@ module PactBroker
       end
 
       def with_test_results(test_results)
-        tests = test_results && test_results['tests']
-        if tests.nil? || !tests.is_a?(Array) || tests.empty?
-          tests = []
+        # new format
+        if test_results.is_a?(Array)
+          tests = test_results
+        else
+          # old format
+          tests = test_results && test_results['tests']
+          if tests.nil? || !tests.is_a?(Array) || tests.empty?
+            tests = []
+          end
         end
 
         new_pact_hash = pact_hash.dup
@@ -67,6 +73,12 @@ module PactBroker
         Content.from_hash(new_pact_hash)
       end
 
+      def interaction_ids
+        messages_or_interaction_or_empty_array.collect do | interaction |
+          interaction['_id']
+        end.compact
+      end
+
       # Half thinking this belongs in GenerateSha
       def content_that_affects_verification_results
         if interactions || messages
@@ -92,6 +104,10 @@ module PactBroker
         messages || interactions
       end
 
+      def messages_or_interaction_or_empty_array
+        messages_or_interactions || []
+      end
+
       def pact_specification_version
         maybe_pact_specification_version_1 = pact_hash['metadata']['pactSpecification']['version'] rescue nil
         maybe_pact_specification_version_2 = pact_hash['metadata']['pact-specification']['version'] rescue nil
@@ -130,7 +146,15 @@ module PactBroker
       end
 
       def test_is_for_interaction(interaction, test)
-        test.is_a?(Hash) && interaction.is_a?(Hash) && test['interactionDescription'] == interaction['description'] && test['interactionProviderState'] == interaction['providerState']
+        test.is_a?(Hash) && interaction.is_a?(Hash) && ( interaction_ids_match(interaction, test) || description_and_state_match(interaction, test))
+      end
+
+      def interaction_ids_match(interaction, test)
+        interaction['_id'] && interaction['_id'] == test['interactionId']
+      end
+
+      def description_and_state_match(interaction, test)
+        test['interactionDescription'] && test['interactionDescription'] == interaction['description'] && test['interactionProviderState'] == interaction['providerState']
       end
     end
   end

data/lib/pact_broker/pacts/repository.rb

@@ -405,42 +405,37 @@ module PactBroker
               SelectedPact.new(pact_publication.to_domain, Selectors.create_for_overall_latest)
             end
         else
-          []
+          selectors_for_overall_latest = consumer_version_selectors.select(&:overall_latest?)
+          selectors_for_overall_latest.flat_map do | selector |
+            query = scope_for(LatestPactPublications).provider(provider_name)
+            query = query.consumer(selector.consumer) if selector.consumer
+            query.collect do | latest_pact_publication |
+              pact_publication = PactPublication.find(id: latest_pact_publication.id)
+              resolved_selector = selector.consumer ? Selector.latest_for_consumer(selector.consumer) : Selector.overall_latest
+              SelectedPact.new(pact_publication.to_domain, Selectors.new(resolved_selector))
+            end
+          end
         end
       end
 
       def find_pacts_for_which_the_latest_version_for_the_tag_is_required(provider_name, consumer_version_selectors)
         # The tags for which only the latest version is specified
-        tag_names = consumer_version_selectors.tag_names_of_selectors_for_latest_pacts
+        selectors = consumer_version_selectors.select(&:latest_for_tag?)
 
-        # TODO make this an efficient query!
-        # These are not yet de-duped. Should make the behaviour consistent between this and find_pacts_for_which_all_versions_for_the_tag_are_required ?
-        if tag_names.any?
-          scope_for(LatestTaggedPactPublications)
-            .provider(provider_name)
-            .where(tag_name: tag_names)
-            .all
-            .group_by(&:pact_version_id)
-            .values
-            .collect do | pact_publications |
-              create_selected_pact(pact_publications)
-            end
-        else
-          []
+        selectors.flat_map do | selector |
+          query = scope_for(LatestTaggedPactPublications).where(tag_name: selector.tag).provider(provider_name)
+          query = query.consumer(selector.consumer) if selector.consumer
+          query.all.collect do | latest_tagged_pact_publication |
+            pact_publication = PactPublication.find(id: latest_tagged_pact_publication.id)
+            resolved_pact = selector.consumer ? Selector.latest_for_tag_and_consumer(selector.tag, selector.consumer) : Selector.latest_for_tag(selector.tag)
+            SelectedPact.new(
+              pact_publication.to_domain,
+              Selectors.new(resolved_pact)
+            )
+          end
         end
       end
 
-      def create_selected_pact(pact_publications)
-        selector_tag_names = pact_publications.collect(&:tag_name)
-        selectors = Selectors.create_for_latest_of_each_tag(selector_tag_names)
-        last_pact_publication = pact_publications.sort_by(&:consumer_version_order).last
-        pact_publication = scope_for(PactPublication).find(id: last_pact_publication.id)
-        SelectedPact.new(
-          pact_publication.to_domain,
-          selectors
-        )
-      end
-
       def create_fallback_selected_pact(pact_publications, consumer_version_selectors)
         selector_tag_names = pact_publications.collect(&:tag_name)
         selectors = Selectors.create_for_latest_fallback_of_each_tag(selector_tag_names)
@@ -454,10 +449,9 @@ module PactBroker
 
       def find_pacts_for_which_the_latest_version_for_the_fallback_tag_is_required(provider_name, selectors)
         selectors.collect do | selector |
-          scope_for(LatestTaggedPactPublications)
-            .provider(provider_name)
-            .where(tag_name: selector.fallback_tag)
-            .all
+          query = scope_for(LatestTaggedPactPublications).provider(provider_name).where(tag_name: selector.fallback_tag)
+          query = query.consumer(selector.consumer) if selector.consumer
+          query.all
             .collect do | latest_tagged_pact_publication |
               pact_publication = unscoped(PactPublication).find(id: latest_tagged_pact_publication.id)
               SelectedPact.new(

data/lib/pact_broker/pacts/selector.rb

@@ -53,6 +53,14 @@ module PactBroker
         Selector.new(tag: tag, consumer: consumer)
       end
 
+      def self.latest_for_tag_and_consumer(tag, consumer)
+        Selector.new(latest: true, tag: tag, consumer: consumer)
+      end
+
+      def self.latest_for_consumer(consumer)
+        Selector.new(latest: true, consumer: consumer)
+      end
+
       def self.from_hash hash
         Selector.new(hash)
       end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.59.2'
+  VERSION = '2.60.0'
 end

data/lib/pact_broker/webhooks/job.rb

@@ -7,9 +7,10 @@ module PactBroker
   module Webhooks
     class Job
 
+      INFO_ERROR_PREFIXES = %w{Errno:: Timeout:: Net:: OpenSSL:: EOFError SocketError}
+
       include SuckerPunch::Job
       include PactBroker::Logging
-      include PactBroker::Logging
 
       def perform data
         data.fetch(:database_connector).call do
@@ -62,7 +63,12 @@ module PactBroker
       end
 
       def handle_error e
-        log_error e, "Error executing triggered webhook with ID #{triggered_webhook ? triggered_webhook.id : nil}"
+        message = "Error executing triggered webhook with ID #{triggered_webhook ? triggered_webhook.id : nil}"
+        if e.class.name.start_with?(*INFO_ERROR_PREFIXES)
+          logger.info(message, e)
+        else
+          logger.warn(message, e)
+        end
         handle_failure
       end
 

data/spec/features/get_provider_pacts_for_verification_spec.rb

@@ -24,24 +24,6 @@ describe "Get provider pacts for verification" do
 
     let(:path) { "/pacts/provider/Provider/for-verification" }
 
-    context "when using GET" do
-      it "returns a 200 HAL JSON response" do
-        expect(subject).to be_a_hal_json_success_response
-      end
-
-      it "returns a list of links to the pacts" do
-        expect(pacts.size).to eq 1
-      end
-
-      context "when the provider does not exist" do
-        let(:path) { "/pacts/provider/ProviderThatDoesNotExist/for-verification" }
-
-        it "returns a 404 response" do
-          expect(subject).to be_a_404_response
-        end
-      end
-    end
-
     context "when using POST" do
       let(:request_body) do
         {

data/spec/lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema_spec.rb

@@ -71,6 +71,27 @@ module PactBroker
           end
         end
 
+        context "when the latest version for a particular consumer is requested" do
+          let(:consumer_version_selectors) do
+            [{
+              consumer: "Foo",
+              latest: true
+            }]
+          end
+
+          it { is_expected.to be_empty }
+        end
+
+        context "when the latest version for all is requested" do
+          let(:consumer_version_selectors) do
+            [{
+              latest: true
+            }]
+          end
+
+          it { is_expected.to be_empty }
+        end
+
         context "when providerVersionTags is not an array" do
           let(:provider_version_tags) { true }
 
@@ -89,7 +110,7 @@ module PactBroker
           end
 
           it "flattens the messages" do
-            expect(subject[:consumerVersionSelectors].first).to eq "tag is missing at index 0"
+            expect(subject[:consumerVersionSelectors].first).to eq "latest must be true, or a tag must be provided (at index 0)"
           end
         end
 
@@ -150,9 +171,7 @@ module PactBroker
             }]
           end
 
-          it "has an error" do
-            expect(subject[:consumerVersionSelectors].first).to include "not yet supported"
-          end
+          it { is_expected.to be_empty }
         end
       end
     end

data/spec/lib/pact_broker/api/resources/provider_pacts_for_verification_spec.rb

@@ -11,7 +11,7 @@ module PactBroker
         end
 
         let(:provider) { double('provider') }
-        let(:pacts) { double('pacts') }
+        let(:pacts) { [] }
         let(:path) { '/pacts/provider/Bar/for-verification' }
         let(:decorator) { instance_double('PactBroker::Api::Decorators::VerifiablePactsDecorator') }
         let(:query) do
@@ -23,35 +23,7 @@ module PactBroker
           }
         end
 
-        subject { get(path, query) }
-
-        describe "GET" do
-          it "finds the pacts for verification by the provider" do
-            # Naughty not mocking out the query parsing...
-            expect(PactBroker::Pacts::Service).to receive(:find_for_verification).with(
-              "Bar",
-              ["master"],
-              PactBroker::Pacts::Selectors.new([PactBroker::Pacts::Selector.latest_for_tag("dev")]),
-              {
-                include_wip_pacts_since: DateTime.parse('2018-01-01'),
-                include_pending_status: true
-              }
-            )
-            subject
-          end
-
-          context "when there are validation errors" do
-            let(:query) do
-              {
-                provider_version_tags: true,
-              }
-            end
-
-            it "returns the keys with the right case" do
-              expect(JSON.parse(subject.body)['errors']).to have_key('provider_version_tags')
-            end
-          end
-        end
+        subject { post(path, request_body.to_json, request_headers) }
 
         describe "POST" do
           let(:request_body) do
@@ -70,8 +42,6 @@ module PactBroker
             }
           end
 
-          subject { post(path, request_body.to_json, request_headers) }
-
           it "finds the pacts for verification by the provider" do
             # Naughty not mocking out the query parsing...
             expect(PactBroker::Pacts::Service).to receive(:find_for_verification).with(
@@ -97,14 +67,14 @@ module PactBroker
               expect(JSON.parse(subject.body)['errors']).to have_key('providerVersionTags')
             end
           end
-        end
 
-        it "uses the correct options for the decorator" do
-          expect(decorator).to receive(:to_json) do | options |
-            expect(options[:user_options][:title]).to eq "Pacts to be verified by provider Bar"
-            expect(options[:user_options][:include_pending_status]).to eq true
+          it "uses the correct options for the decorator" do
+            expect(decorator).to receive(:to_json) do | options |
+              expect(options[:user_options][:title]).to eq "Pacts to be verified by provider Bar"
+              expect(options[:user_options][:include_pending_status]).to eq true
+            end
+            subject
           end
-          subject
         end
       end
     end

data/spec/lib/pact_broker/pacts/content_spec.rb

@@ -359,6 +359,88 @@ module PactBroker
             expect(subject.to_hash).to eq merged_with_empty_tests
           end
         end
+
+        context "with the new format" do
+          let(:test_results) do
+            [
+              {
+                "interactionId" => "1",
+                "success "=> false
+              },{
+                "foo" => "bar"
+              }
+            ]
+          end
+
+          let(:pact_content) do
+            {
+              "interactions" => [
+                {
+                 "_id" => "1"
+                },
+                {
+                 "_id" => "2"
+                }
+              ]
+            }
+          end
+
+          let(:merged) do
+            {
+              "interactions" => [
+                {
+                 "_id" => "1",
+                 "tests" => [{
+                    "interactionId" => "1",
+                    "success "=> false
+                  }]
+                },{
+                 "_id" => "2",
+                 "tests" => []
+                }
+              ]
+            }
+          end
+
+          it "merges the tests into the pact content" do
+            expect(subject.to_hash).to eq merged
+          end
+        end
+      end
+
+      describe "interaction_ids" do
+        let(:interaction_1) do
+          {
+            _id: '1'
+          }
+        end
+
+        let(:interaction_2) do
+          {
+            _id: '2'
+          }
+        end
+
+        let(:interaction_3) do
+          {
+          }
+        end
+
+        let(:content_hash) do
+          {
+            interactions: [interaction_1, interaction_2, interaction_3]
+          }
+        end
+
+        subject { Content.from_json(content_hash.to_json) }
+
+        its(:interaction_ids) { is_expected.to eq ['1', '2'] }
+
+        context "when there are no interactions" do
+          let(:content_hash) { {} }
+
+          its(:interaction_ids) { is_expected.to eq [] }
+        end
       end
     end
   end

data/spec/lib/pact_broker/pacts/repository_find_for_verification_fallback_spec.rb

@@ -56,6 +56,20 @@ module PactBroker
             it "sets the latest flag on the selector" do
               expect(find_by_consumer_version_number("1").selectors.first.latest).to be true
             end
+
+            context "when a consumer is specified" do
+              before do
+                td.create_pact_with_consumer_version_tag("Foo2", "3", "master", "Bar")
+              end
+
+              let(:selector) { Selector.new(tag: tag, fallback_tag: fallback_tag, latest: true, consumer: "Foo") }
+
+              it "only returns the pacts for the consumer" do
+                expect(subject.size).to eq 1
+                expect(subject.first.consumer.name).to eq "Foo"
+                expect(subject.first.selectors.first).to eq selector
+              end
+            end
           end
 
           context "when a pact does not exist for either tag or fallback_tag" do

data/spec/lib/pact_broker/pacts/repository_find_for_verification_spec.rb

@@ -40,6 +40,68 @@ module PactBroker
           end
         end
 
+        context "when the selector is latest: true" do
+          let(:pact_selector_1) { Selector.overall_latest }
+          let(:consumer_version_selectors) do
+            Selectors.new(pact_selector_1)
+          end
+
+          before do
+            td.create_pact_with_hierarchy("Foo1", "1", "Bar")
+              .create_pact_with_hierarchy("Foo1", "2", "Bar")
+              .create_pact_with_hierarchy("Foo2", "3", "Bar")
+              .create_pact_with_hierarchy("Foo2", "4", "Bar2")
+          end
+
+          it "returns the latest pact for each consumer" do
+            expect(subject.size).to eq 2
+            expect(find_by_consumer_name_and_consumer_version_number("Foo1", "2").selectors).to eq [Selector.overall_latest]
+            expect(find_by_consumer_name_and_consumer_version_number("Foo2", "3").selectors).to eq [Selector.overall_latest]
+          end
+        end
+
+        context "when the selector is latest: true for a particular consumer" do
+          let(:pact_selector_1) { Selector.latest_for_consumer("Foo1") }
+
+          let(:consumer_version_selectors) do
+            Selectors.new(pact_selector_1)
+          end
+
+          before do
+            td.create_pact_with_hierarchy("Foo1", "1", "Bar")
+              .create_pact_with_hierarchy("Foo1", "2", "Bar")
+              .create_pact_with_hierarchy("Foo2", "2", "Bar")
+              .create_pact_with_hierarchy("Foo2", "2", "Bar2")
+          end
+
+          it "returns the latest pact for each consumer" do
+            expect(subject.size).to eq 1
+            expect(find_by_consumer_name_and_consumer_version_number("Foo1", "2").selectors).to eq [pact_selector_1]
+          end
+        end
+
+        context "when the selector is latest: true, with a tag, for a particular consumer" do
+          let(:pact_selector_1) { Selector.latest_for_tag_and_consumer("prod", "Foo1") }
+
+          let(:consumer_version_selectors) do
+            Selectors.new(pact_selector_1)
+          end
+
+          before do
+            td.create_pact_with_hierarchy("Foo1", "1", "Bar")
+              .create_consumer_version_tag("prod")
+              .create_pact_with_hierarchy("Foo1", "2", "Bar")
+              .create_pact_with_hierarchy("Foo2", "2", "Bar")
+              .create_consumer_version_tag("prod")
+              .create_pact_with_hierarchy("Foo2", "2", "Bar2")
+          end
+
+          it "returns the latest pact for each consumer" do
+            expect(subject.size).to eq 1
+            expect(find_by_consumer_name_and_consumer_version_number("Foo1", "1").selectors).to eq [pact_selector_1]
+          end
+        end
+
         context "when the latest consumer tag names are specified" do
           before do
             td.create_pact_with_hierarchy("Foo", "foo-latest-prod-version", "Bar")

data/spec/lib/pact_broker/webhooks/job_spec.rb

@@ -53,7 +53,25 @@ module PactBroker
 
       context "when an error occurs for the first time" do
         before do
-          allow(PactBroker::Webhooks::Service).to receive(:execute_triggered_webhook_now).and_raise("an error")
+          allow(PactBroker::Webhooks::Service).to receive(:execute_triggered_webhook_now).and_raise(error)
+        end
+
+        let(:error) { "an error" }
+
+        context "when the error is HTTP related (most likely caused by a problem with the webhook or request itself)" do
+          let(:error) { Errno::ECONNREFUSED.new }
+
+          it "logs a message at info" do
+            expect(logger).to receive(:info).with(/Error executing/, error)
+            subject
+          end
+        end
+
+        context "when the error is not HTTP related (most likely caused by a code, platform or environment issue)" do
+          it "logs a message at warn" do
+            expect(logger).to receive(:warn).with(/Error executing/, instance_of(RuntimeError))
+            subject
+          end
         end
 
         it "reschedules the job in 10 seconds" do

data/spec/support/database_cleaner.rb

@@ -8,11 +8,7 @@ RSpec.configure do |config|
   config.before(:suite) do
     if defined?(::DB)
       DatabaseCleaner.strategy = :transaction
-      if DB.mysql?
-        DatabaseCleaner.clean_with :deletion
-      else
-        DatabaseCleaner.clean_with :truncation
-      end
+      PactBroker::Database.truncate
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.59.2
+  version: 2.60.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -581,7 +581,6 @@ files:
 - lib/pact_broker/api/contracts/put_pact_params_contract.rb
 - lib/pact_broker/api/contracts/request_validations.rb
 - lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema.rb
-- lib/pact_broker/api/contracts/verifiable_pacts_query_schema.rb
 - lib/pact_broker/api/contracts/verification_contract.rb
 - lib/pact_broker/api/contracts/webhook_contract.rb
 - lib/pact_broker/api/decorators.rb
@@ -760,6 +759,7 @@ files:
 - lib/pact_broker/doc/views/pact/tag-prod-version.markdown
 - lib/pact_broker/doc/views/pact/tag-version.markdown
 - lib/pact_broker/doc/views/pending-provider-pacts.markdown
+- lib/pact_broker/doc/views/provider-pacts-for-verification.markdown
 - lib/pact_broker/doc/views/provider.markdown
 - lib/pact_broker/doc/views/version/latest-verification-results-where-pacticipant-is-consumer.markdown
 - lib/pact_broker/doc/views/webhooks.markdown
@@ -1120,7 +1120,6 @@ files:
 - spec/lib/pact/doc/markdown/index_renderer_spec.rb
 - spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema_spec.rb
-- spec/lib/pact_broker/api/contracts/verifiable_pacts_query_schema_spec.rb
 - spec/lib/pact_broker/api/contracts/verification_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/webhook_contract_spec.rb
 - spec/lib/pact_broker/api/decorators/dashboard_decorator_spec.rb
@@ -1506,7 +1505,6 @@ test_files:
 - spec/lib/pact/doc/markdown/index_renderer_spec.rb
 - spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema_spec.rb
-- spec/lib/pact_broker/api/contracts/verifiable_pacts_query_schema_spec.rb
 - spec/lib/pact_broker/api/contracts/verification_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/webhook_contract_spec.rb
 - spec/lib/pact_broker/api/decorators/dashboard_decorator_spec.rb

data/lib/pact_broker/api/contracts/verifiable_pacts_query_schema.rb

@@ -1,36 +0,0 @@
-require 'dry-validation'
-require 'pact_broker/api/contracts/dry_validation_workarounds'
-require 'pact_broker/api/contracts/dry_validation_predicates'
-
-module PactBroker
-  module Api
-    module Contracts
-      class VerifiablePactsQuerySchema
-        extend DryValidationWorkarounds
-        using PactBroker::HashRefinements
-
-        SCHEMA = Dry::Validation.Schema do
-          configure do
-            predicates(DryValidationPredicates)
-            config.messages_file = File.expand_path("../../../locale/en.yml", __FILE__)
-          end
-          optional(:provider_version_tags).maybe(:array?)
-          optional(:consumer_version_selectors).each do
-            schema do
-              required(:tag).filled(:str?)
-              optional(:latest).filled(included_in?: ["true", "false"])
-              optional(:fallback_tag).filled(:str?)
-              optional(:consumer).filled(:str?, :not_blank?)
-            end
-          end
-          optional(:include_pending_status).filled(included_in?: ["true", "false"])
-          optional(:include_wip_pacts_since).filled(:date?)
-        end
-
-        def self.call(params)
-          select_first_message(flatten_indexed_messages(SCHEMA.call(params&.symbolize_keys).messages(full: true)))
-        end
-      end
-    end
-  end
-end

data/spec/lib/pact_broker/api/contracts/verifiable_pacts_query_schema_spec.rb

@@ -1,97 +0,0 @@
-require 'pact_broker/api/contracts/verifiable_pacts_query_schema'
-
-module PactBroker
-  module Api
-    module Contracts
-      describe VerifiablePactsQuerySchema do
-        let(:params) do
-          {
-            provider_version_tags: provider_version_tags,
-            consumer_version_selectors: consumer_version_selectors
-          }
-        end
-
-        let(:provider_version_tags) { %w[master] }
-
-        let(:consumer_version_selectors) do
-          [{
-            tag: "master",
-            latest: "true"
-          }]
-        end
-
-        subject { VerifiablePactsQuerySchema.(params) }
-
-        context "when the params are valid" do
-          it "has no errors" do
-            expect(subject).to eq({})
-          end
-        end
-
-        context "when provider_version_tags is not an array" do
-          let(:provider_version_tags) { "foo" }
-
-          it { is_expected.to have_key(:provider_version_tags) }
-        end
-
-        context "when the consumer_version_selector is missing a tag" do
-          let(:consumer_version_selectors) do
-            [{}]
-          end
-
-          it "flattens the messages" do
-            expect(subject[:consumer_version_selectors].first).to eq "tag is missing at index 0"
-          end
-        end
-
-        context "when the consumer_version_selectors is missing the latest" do
-          let(:consumer_version_selectors) do
-            [{
-              tag: "master"
-            }]
-          end
-
-          it { is_expected.to be_empty }
-        end
-
-        context "when include_wip_pacts_since key exists" do
-          let(:include_wip_pacts_since) { nil }
-          let(:params) do
-            {
-              include_wip_pacts_since: include_wip_pacts_since
-            }
-          end
-
-          context "when it is nil" do
-            it { is_expected.to have_key(:include_wip_pacts_since) }
-          end
-
-          context "when it is not a date" do
-            let(:include_wip_pacts_since) { "foo" }
-
-            it { is_expected.to have_key(:include_wip_pacts_since) }
-          end
-
-          context "when it is a valid date" do
-            let(:include_wip_pacts_since) { "2013-02-13T20:04:45.000+11:00" }
-
-            it { is_expected.to_not have_key(:include_wip_pacts_since) }
-          end
-        end
-
-        context "when a blank consumer name is specified" do
-          let(:consumer_version_selectors) do
-            [{
-              tag: "feat-x",
-              consumer: ""
-            }]
-          end
-
-          it "has an error" do
-            expect(subject[:consumer_version_selectors].first).to include "blank"
-          end
-        end
-      end
-    end
-  end
-end