pact_broker 2.41.0 → 2.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aea6eddd75f874a8b5e1994d0269b72e4f8745c
-  data.tar.gz: bf9c5cc37f4d5df1dcaa53d21e8c902c645a0973
+  metadata.gz: 1beb82704006c0aa9708a9b4e9af93075bfc3bf9
+  data.tar.gz: 8cb7b7148ce8a3152d6ccbe35e49f3e646f5e628
 SHA512:
-  metadata.gz: ea61f5bf743380ce29ab3ad0d5dadf842ae5aead4e0dd209157c8841ccbfc9b0614245463eaf596b40764e349635652394144f2769fc3ffd6a1f900e7e45a930
-  data.tar.gz: 1c023a21856fbbb8ca7e8a172b0720016b7509231270b64cf18a8bc8f6ba485131484debf7d261a7a6aff9cfd90de4d7b927da00d793e1744be679322f567d33
+  metadata.gz: b289766c4bc421c975fefc7a109f97eb6bc5f31eac99d1dd6e7754d7f2c7cf7f7dca21652d55d28a1e64d5eacd5f26e16f30ac1af3e2111eefc9a38bb42128f4
+  data.tar.gz: d6ce416cd0133c2d8278e1addc4f99814a118d9a800a74d1937168ac132e9f7ff27c3a48d63866ffaac0ec0424bd433f468812695e133edbf7a6698edbc9ba09

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+<a name="v2.42.0"></a>
+### v2.42.0 (2019-12-05)
+
+
+#### Features
+
+* **pacts for verification**
+  * include list of notices to print rather than inclusionReason and pendingReason	 ([eed0120e](/../../commit/eed0120e))
+  * only include WIP pacts that were published after the provider tag was first used	 ([673fcb8c](/../../commit/673fcb8c))
+
+* **webhooks**
+  * allow webhooks to be triggered for verification successes and failures	 ([6735da32](/../../commit/6735da32))
+
+
 <a name="v2.41.0"></a>
 ### v2.41.0 (2019-11-21)
 

data/lib/pact_broker/api/decorators/verifiable_pact_decorator.rb

@@ -28,6 +28,9 @@ module PactBroker
           property :pending_reason, as: :pendingReason, exec_context: :decorator,
             if: ->(context) { context[:options][:user_options][:include_pending_status] }
 
+          property :notices, getter: -> (context) { context[:decorator].notices(context[:options][:user_options]) }
+          property :noteToDevelopers, getter: -> (_) { "Please print out the text from the 'notices' rather than using the inclusionReason and the pendingReason fields. These will be removed when this API moves out of beta."}
+
           def inclusion_reason
             PactBroker::Pacts::VerifiablePactMessages.new(represented).inclusion_reason
           end
@@ -35,6 +38,14 @@ module PactBroker
           def pending_reason
             PactBroker::Pacts::VerifiablePactMessages.new(represented).pending_reason
           end
+
+          def notices(user_options)
+            mess = [{
+              text: inclusion_reason
+            }]
+            mess << { text: pending_reason } if user_options[:include_pending_status]
+            mess
+          end
         end
 
         link :self do | context |

data/lib/pact_broker/doc/views/webhooks.markdown

@@ -80,7 +80,11 @@ To specify an XML body, you will need to use a correctly escaped string (or use
 
 `contract_content_changed:` triggered when the content of the contract, or tags applied to the contract have changed since the previous publication. If `base_equality_only_on_content_that_affects_verification_results` is set to `true` in the configuration (the default), any changes to whitespace, ordering of keys, or the ordering of the `interactions` or `messages` will be ignored, and will not trigger this event. It is recommended to trigger a provider verification build for this event.
 
-`provider_verification_published:` triggered whenever a provider publishes a verification.
+`provider_verification_published:` triggered whenever a provider publishes a verification result.
+
+`provider_verification_succeeded:` triggered whenever a provider publishes a successful verification result.
+
+`provider_verification_failed:` triggered whenever a provider publishes a failed verification result.
 
 ### Dynamic variable substitution
 

data/lib/pact_broker/domain/webhook.rb

@@ -85,6 +85,14 @@ module PactBroker
         events.any?(&:provider_verification_published?)
       end
 
+      def trigger_on_provider_verification_succeeded?
+        events.any?(&:provider_verification_succeeded?)
+      end
+
+      def trigger_on_provider_verification_failed?
+        events.any?(&:provider_verification_failed?)
+      end
+
       private
 
       def execute_request(webhook_request)

data/lib/pact_broker/pacts/all_pact_publications.rb

@@ -109,7 +109,7 @@ module PactBroker
       def head_tag_names
         # Avoid circular dependency
         require 'pact_broker/pacts/latest_tagged_pact_publications'
-        LatestTaggedPactPublications.where(id: id).select(:tag_name).collect{|t| t[:tag_name]}
+        @head_tag_names ||= LatestTaggedPactPublications.where(id: id).select(:tag_name).collect{|t| t[:tag_name]}
       end
 
       def to_domain_with_content

data/lib/pact_broker/pacts/repository.rb

@@ -125,22 +125,57 @@ module PactBroker
         end
       end
 
-      def find_wip_pact_versions_for_provider provider_name, provider_tags = [], options = {}
-        return [] if provider_tags.empty?
+      # To find the work in progress pacts for this verification execution:
+      # For each provider tag that will be applied to this verification result (usually there will just be one, but
+      # we have to allow for multiple tags),
+      # find the head pacts (the pacts that are the latest for their tag) that have been successfully
+      # verified against the provider tag.
+      # Then, find all the head pacts, and remove the ones that have been successfully verified by ALL
+      # of the provider tags supplied.
+      # Then, for all of the head pacts that are remaining (these are the WIP ones) work out which
+      # provider tags they are pending for.
+      # Don't include pact publications that were created
+      def find_wip_pact_versions_for_provider provider_name, provider_tags_names = [], options = {}
+        return [] if provider_tags_names.empty?
+
+        provider = pacticipant_repository.find_by_name(provider_name)
+
+        # Hash of provider tag names => list of head pacts
+        successfully_verified_head_pacts_for_provider_tags = find_successfully_verified_head_pacts_by_provider_tag(provider_name, provider_tags_names, options)
+        successfully_verified_head_pact_publication_ids_for_each_provider_tag = successfully_verified_head_pacts_for_provider_tags.each_with_object({}) do | (provider_tag_name, head_pacts), hash |
+          hash[provider_tag_name] = head_pacts.collect(&:id)
+        end
 
-        # Hash of provider tag names => list of pact_publication_ids
-        successfully_verified_head_pact_publication_ids_for_each_provider_tag = find_successfully_verified_head_pacts_by_provider_tag(provider_name, provider_tags, options)
+        # list of pact_publication_ids that are NOT work in progress
+        head_pact_publication_ids_successully_verified_by_all_provider_tags = successfully_verified_head_pacts_for_provider_tags.values.collect{ |head_pacts| head_pacts.collect(&:id) }.reduce(:&)
 
         pact_publication_ids = find_head_pacts_that_have_not_been_successfully_verified_by_all_provider_tags(
           provider_name,
-          successfully_verified_head_pact_publication_ids_for_each_provider_tag.values.reduce(:&),
+          head_pact_publication_ids_successully_verified_by_all_provider_tags,
           options)
 
-        pacts = AllPactPublications.where(id: pact_publication_ids).order_ignore_case(:consumer_name).order_append(:consumer_version_order).collect(&:to_domain)
+        pacts = AllPactPublications.where(id: pact_publication_ids).order_ignore_case(:consumer_name).order_append(:consumer_version_order)
+
+        # The first instance (by date) of each provider tag with that name
+        provider_tag_collection = PactBroker::Domain::Tag
+          .select_group(Sequel[:tags][:name], Sequel[:pacticipant_id])
+          .select_append(Sequel.function(:min, Sequel[:tags][:created_at]).as(:created_at))
+          .distinct
+          .join(:versions, { Sequel[:tags][:version_id] => Sequel[:versions][:id] } )
+          .where(pacticipant_id: provider.id)
+          .where(name: provider_tags_names)
+          .all
+
         pacts.collect do | pact|
-          pending_tags = find_provider_tags_for_which_pact_publication_id_is_pending(pact.id, successfully_verified_head_pact_publication_ids_for_each_provider_tag)
-          VerifiablePact.new(pact, true, pending_tags, [], pact.consumer_version_tag_names, nil, true)
-        end
+          pending_tag_names = find_provider_tags_for_which_pact_publication_id_is_pending(pact, successfully_verified_head_pact_publication_ids_for_each_provider_tag)
+          pre_existing_tag_names = find_provider_tag_names_that_were_first_used_before_pact_published(pact, provider_tag_collection)
+
+          pre_existing_pending_tags = pending_tag_names & pre_existing_tag_names
+
+          if pre_existing_pending_tags.any?
+            VerifiablePact.new(pact.to_domain, true, pre_existing_pending_tags, [], pact.head_tag_names, nil, true)
+          end
+        end.compact
       end
 
       def find_pact_versions_for_provider provider_name, tag = nil
@@ -333,13 +368,27 @@ module PactBroker
         query
       end
 
-      def find_provider_tags_for_which_pact_publication_id_is_pending(pact_publication_id, successfully_verified_head_pact_publication_ids_for_each_provider_tag)
+      def find_provider_tags_for_which_pact_publication_id_is_pending(pact_publication, successfully_verified_head_pact_publication_ids_for_each_provider_tag)
         successfully_verified_head_pact_publication_ids_for_each_provider_tag
-          .select do | provider_tag, pact_publication_ids |
-            !pact_publication_ids.include?(pact_publication_id)
+          .select do | _, pact_publication_ids |
+            !pact_publication_ids.include?(pact_publication.id)
           end.keys
       end
 
+      def find_provider_tag_names_that_were_first_used_before_pact_published(pact_publication, provider_tag_collection)
+        provider_tag_collection.select { | tag| to_datetime(tag.created_at) < pact_publication.created_at }.collect(&:name)
+      end
+
+      # Note: created_at is coming back as a string for sqlite
+      # Can't work out how to to tell Sequel that this should be a date
+      def to_datetime string_or_datetime
+        if string_or_datetime.is_a?(String)
+          Sequel.string_to_datetime(string_or_datetime)
+        else
+          string_or_datetime
+        end
+      end
+
       def find_head_pacts_that_have_not_been_successfully_verified_by_all_provider_tags(provider_name, pact_publication_ids_successfully_verified_by_all_provider_tags, options)
         # Exclude the head pacts that have been successfully verified by all the specified provider tags
         pact_publication_ids = LatestTaggedPactPublications
@@ -349,18 +398,20 @@ module PactBroker
           .select_for_subquery(:id)
       end
 
+      # Find the head pacts that have been successfully verified by a provider version with the specified tags
+      # Returns a Hash of provider_tag => LatestTaggedPactPublications with only id and tag_name populated
       def find_successfully_verified_head_pacts_by_provider_tag(provider_name, provider_tags, options)
-        provider_tags.compact.each_with_object({}) do | provider_tag, tag_to_ids_hash |
-          ids = LatestTaggedPactPublications
+        provider_tags.compact.each_with_object({}) do | provider_tag, hash |
+          head_pacts = LatestTaggedPactPublications
             .join(:verifications, { pact_version_id: :pact_version_id })
             .join(:tags, { Sequel[:verifications][:provider_version_id] => Sequel[:provider_tags][:version_id] }, {table_alias: :provider_tags})
             .where(Sequel[:provider_tags][:name] => provider_tag)
             .provider(provider_name)
             .where(Sequel[:verifications][:success] => true)
-            .where(Sequel.lit('latest_tagged_pact_publications.created_at > ?', options.fetch(:include_wip_pacts_since)))
-            .select(Sequel[:latest_tagged_pact_publications][:id].as(:id))
-            .collect(&:id)
-          tag_to_ids_hash[provider_tag] = ids
+            .or(Sequel.lit('latest_tagged_pact_publications.created_at < ?', options.fetch(:include_wip_pacts_since)))
+            .select(Sequel[:latest_tagged_pact_publications][:id].as(:id), :tag_name)
+            .all
+          hash[provider_tag] = head_pacts
         end
       end
     end

data/lib/pact_broker/test/test_data_builder.rb

@@ -46,6 +46,7 @@ module PactBroker
       attr_reader :triggered_webhook
 
       def initialize(params = {})
+        @now = DateTime.now
       end
 
       def comment *args
@@ -73,8 +74,10 @@ module PactBroker
       end
 
       def create_pact_with_hierarchy consumer_name = "Consumer", consumer_version = "1.2.3", provider_name = "Provider", json_content = default_json_content
-        create_consumer consumer_name
-        create_provider provider_name
+        use_consumer(consumer_name)
+        create_consumer(consumer_name) if !consumer
+        use_provider(provider_name)
+        create_provider provider_name if !provider
         create_consumer_version consumer_version
         create_pact json_content: json_content
         self
@@ -246,6 +249,14 @@ module PactBroker
         create_webhook(parameters.merge(consumer: nil, provider: nil, event_names: [PactBroker::Webhooks::WebhookEvent::VERIFICATION_PUBLISHED]))
       end
 
+      def create_global_verification_succeeded_webhook parameters = {}
+        create_webhook(parameters.merge(consumer: nil, provider: nil, event_names: [PactBroker::Webhooks::WebhookEvent::VERIFICATION_SUCCEEDED]))
+      end
+
+      def create_global_verification_failed_webhook parameters = {}
+        create_webhook(parameters.merge(consumer: nil, provider: nil, event_names: [PactBroker::Webhooks::WebhookEvent::VERIFICATION_FAILED]))
+      end
+
       def create_provider_webhook parameters = {}
         create_webhook(parameters.merge(consumer: nil))
       end
@@ -334,6 +345,11 @@ module PactBroker
         self
       end
 
+      def add_minute
+        @now = @now + (1.0/(24*60))
+        self
+      end
+
       def add_five_minutes
         @now = @now + (1.0/(24*60)*5)
         self

data/lib/pact_broker/verifications/service.rb

@@ -31,9 +31,9 @@ module PactBroker
         execution_configuration = webhook_options[:webhook_execution_configuration]
                                     .with_webhook_context(provider_version_tags: verification.provider_version_tag_names)
 
-        webhook_service.trigger_webhooks(pact,
+        webhook_trigger_service.trigger_webhooks_for_verification_results_publication(
+          pact,
           verification,
-          PactBroker::Webhooks::WebhookEvent::VERIFICATION_PUBLISHED,
           webhook_options.deep_merge(webhook_execution_configuration: execution_configuration)
         )
         verification

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.41.0'
+  VERSION = '2.42.0'
 end

data/lib/pact_broker/webhooks/trigger_service.rb

@@ -29,6 +29,31 @@ module PactBroker
         end
       end
 
+      def trigger_webhooks_for_verification_results_publication(pact, verification, webhook_options)
+        if verification.success
+          webhook_service.trigger_webhooks(
+            pact,
+            verification,
+            PactBroker::Webhooks::WebhookEvent::VERIFICATION_SUCCEEDED,
+            webhook_options
+          )
+        else
+          webhook_service.trigger_webhooks(
+            pact,
+            verification,
+            PactBroker::Webhooks::WebhookEvent::VERIFICATION_FAILED,
+            webhook_options
+          )
+        end
+
+        webhook_service.trigger_webhooks(
+          pact,
+          verification,
+          PactBroker::Webhooks::WebhookEvent::VERIFICATION_PUBLISHED,
+          webhook_options
+        )
+      end
+
       private
 
       def pact_is_new_or_newly_tagged_or_pact_has_changed_since_previous_version? pact

data/lib/pact_broker/webhooks/webhook_event.rb

@@ -8,11 +8,11 @@ module PactBroker
       CONTRACT_PUBLISHED = 'contract_published'
       CONTRACT_CONTENT_CHANGED = 'contract_content_changed'
       VERIFICATION_PUBLISHED = 'provider_verification_published'
+      VERIFICATION_SUCCEEDED = 'provider_verification_succeeded'
+      VERIFICATION_FAILED = 'provider_verification_failed'
       DEFAULT_EVENT_NAME = CONTRACT_CONTENT_CHANGED
-      #CONTRACT_VERIFIABLE_CONTENT_CHANGED = 'contract_verifiable_content_changed'
-      #VERIFICATION_STATUS_CHANGED = 'verification_status_changed'
 
-      EVENT_NAMES = [CONTRACT_PUBLISHED, CONTRACT_CONTENT_CHANGED, VERIFICATION_PUBLISHED]
+      EVENT_NAMES = [CONTRACT_PUBLISHED, CONTRACT_CONTENT_CHANGED, VERIFICATION_PUBLISHED, VERIFICATION_FAILED]
 
       dataset_module do
         include PactBroker::Repositories::Helpers
@@ -30,6 +30,13 @@ module PactBroker
         name == VERIFICATION_PUBLISHED
       end
 
+      def provider_verification_succeeded?
+        name == VERIFICATION_SUCCEEDED
+      end
+
+      def provider_verification_failed?
+        name == VERIFICATION_FAILED
+      end
     end
 
     WebhookEvent.plugin :timestamps, update_on_create: true

data/script/seed.rb

@@ -42,9 +42,17 @@ webhook_body = {
   'githubVerificationStatus' => '${pactbroker.githubVerificationStatus}'
 }
 
+  # .create_global_webhook(
+  #   method: 'POST',
+  #   url: "http://localhost:9292/pact-changed-webhook",
+  #   body: webhook_body.to_json,
+  #   username: "foo",
+  #   password: "bar")
 TestDataBuilder.new
-  .create_global_webhook(method: 'POST', url: "http://localhost:9292/pact-changed-webhook", body: webhook_body.to_json, username: "foo", password: "bar")
-  .create_global_verification_webhook(method: 'POST', url: "http://localhost:9292/verification-published-webhook", body: webhook_body.to_json)
+  .create_global_verification_succeeded_webhook(
+    method: 'POST',
+    url: "http://localhost:9292/verification-published-webhook",
+    body: webhook_body.to_json)
   # .create_certificate(path: 'spec/fixtures/certificates/self-signed.badssl.com.pem')
   # .create_consumer("Bethtest")
   # .create_verification_webhook(method: 'GET', url: "http://localhost:9292", body: webhook_body, username: "foo", password: "bar", headers: {"Accept" => "application/json"})

data/spec/features/wip_pacts_spec.rb

@@ -1,4 +1,10 @@
 RSpec.describe "the lifecycle of a WIP pact" do
+  before do
+    td.set_now(DateTime.now - 100)
+      .create_provider("Bar")
+      .create_provider_version("1")
+      .create_provider_version_tag("master")
+  end
   let(:pact_content_1) { { interactions: [{ some: 'interaction'}] }.to_json }
   let(:pact_content_2) { { interactions: [{ some: 'other interaction'}] }.to_json }
   let(:request_headers) { { "CONTENT_TYPE" => "application/json", "HTTP_ACCEPT" => "application/hal+json"} }
@@ -122,7 +128,6 @@ RSpec.describe "the lifecycle of a WIP pact" do
           verification_results_url = verification_results_url_from(pact_response)
           publish_verification_results_with_tag_master(verification_results_url, successful_verification_results)
 
-
           # ANOTHER PROVIDER BUILD 2
           # get pacts for verification
           # publish successful verification results
@@ -131,8 +136,6 @@ RSpec.describe "the lifecycle of a WIP pact" do
           expect(wip_pacts_from(pacts_for_verification_response).size).to eq 0
         end
       end
-
-  end
-
+    end
   end
 end

data/spec/lib/pact_broker/api/decorators/verifiable_pact_decorator_spec.rb

@@ -6,15 +6,23 @@ module PactBroker
       describe VerifiablePactDecorator do
         before do
           allow(decorator).to receive(:pact_version_url).and_return('/pact-version-url')
-          allow_any_instance_of(PactBroker::Pacts::VerifiablePactMessages).to receive(:inclusion_reason).and_return("inclusion_reason")
-          allow_any_instance_of(PactBroker::Pacts::VerifiablePactMessages).to receive(:pending_reason).and_return("pending_reason")
+          allow_any_instance_of(PactBroker::Pacts::VerifiablePactMessages).to receive(:inclusion_reason).and_return("the inclusion reason")
+          allow_any_instance_of(PactBroker::Pacts::VerifiablePactMessages).to receive(:pending_reason).and_return(pending_reason)
         end
+        let(:pending_reason) { "the pending reason" }
         let(:expected_hash) do
           {
             "verificationProperties" => {
               "pending" => true,
-              "pendingReason" => "pending_reason",
-              "inclusionReason" => "inclusion_reason"
+              "notices" => [
+                {
+                  "text" => "the inclusion reason"
+                }, {
+                  "text" => pending_reason
+                }
+              ],
+              "pendingReason" => pending_reason,
+              "inclusionReason" => "the inclusion reason"
             },
             "_links" => {
               "self" => {
@@ -55,6 +63,7 @@ module PactBroker
 
         context "when include_pending_status is false" do
           let(:include_pending_status) { false }
+          let(:notices) { subject['verificationProperties']['notices'].collect{ | notice | notice['text'] } }
 
           it "does not include the pending flag" do
             expect(subject['verificationProperties']).to_not have_key('pending')
@@ -62,6 +71,7 @@ module PactBroker
 
           it "does not include the pending reason" do
             expect(subject['verificationProperties']).to_not have_key('pendingReason')
+            expect(notices).to_not include(pending_reason)
           end
         end
 

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

@@ -39,7 +39,13 @@ module PactBroker
 
         context "when the latest pact for a tag has been successfully verified by one of the given provider tags, but not the other" do
           before do
-            td.create_pact_with_hierarchy("foo", "1", "bar")
+            td.create_provider("bar")
+              .create_provider_version("44")
+              .create_provider_version_tag("feat-1")
+              .add_day
+              .create_consumer("foo")
+              .create_consumer_version("1")
+              .create_pact
               .create_consumer_version_tag("prod")
               .create_verification(provider_version: "3", tag_names: %w[dev], comment: "not included because already verified")
           end
@@ -57,7 +63,11 @@ module PactBroker
 
         context "when the latest pact for a tag has failed verification from the specified provider version" do
           before do
-            td.create_pact_with_hierarchy("foo", "1", "bar")
+            td.create_provider("bar")
+              .create_provider_version("333")
+              .create_provider_version_tag("dev")
+              .add_day
+              .create_pact_with_hierarchy("foo", "1", "bar")
               .create_consumer_version_tag("feat-1")
               .create_verification(provider_version: "3", success: false, tag_names: %[dev])
           end
@@ -84,7 +94,11 @@ module PactBroker
 
         context "when the latest pact for a tag has successful and failed verifications" do
           before do
-            td.create_pact_with_hierarchy("foo", "1", "bar")
+            td.create_provider("bar")
+              .create_provider_version("333")
+              .create_provider_version_tag("dev")
+              .add_day
+              .create_pact_with_hierarchy("foo", "1", "bar")
               .create_consumer_version_tag("dev")
               .create_verification(provider_version: "3", success: true, tag_names: %[dev])
               .create_verification(provider_version: "5", success: false, number: 2, tag_names: %[dev])
@@ -97,8 +111,12 @@ module PactBroker
 
         context "when the latest pact for a tag has not been verified" do
           before do
-            td.create_pact_with_hierarchy("foo", "1", "bar")
-              .create_consumer_version_tag("dev")
+            td.create_provider("bar")
+              .create_provider_version("333")
+              .create_provider_version_tag("dev")
+              .add_day
+              .create_pact_with_hierarchy("foo", "1", "bar")
+              .create_consumer_version_tag("feat-1")
           end
 
           it "is included" do
@@ -123,7 +141,11 @@ module PactBroker
 
         context "when the pact was published before the specified include_wip_pacts_since" do
           before do
-            td.create_pact_with_hierarchy("foo", "1", "bar")
+            td.create_provider("bar")
+              .create_provider_version("333")
+              .create_provider_version_tag("dev")
+              .add_day
+              .create_pact_with_hierarchy("foo", "1", "bar")
               .create_consumer_version_tag("prod")
           end
 
@@ -133,6 +155,51 @@ module PactBroker
             expect(subject.size).to be 0
           end
         end
+
+        context "when the first provider tag with a given name was created after the head pact was created" do
+          before do
+            td.create_pact_with_hierarchy("foo", "1", "bar")
+              .create_consumer_version_tag("feat-x")
+              .add_day
+              .create_provider_version("5")
+              .create_provider_version_tag(provider_tags.first)
+          end
+
+          it "doesn't return any pacts" do
+            expect(subject.size).to be 0
+          end
+        end
+
+        context "when the provider tag does not exist yet" do
+          before do
+            td.create_pact_with_hierarchy("foo", "1", "bar")
+              .create_consumer_version_tag("feat-x")
+          end
+
+          it "doesn't return any pacts" do
+            expect(subject.size).to be 0
+          end
+        end
+
+        context "when a pact was published between the first creation date of two provider tags" do
+          let(:provider_tags) { %w[dev feat-1] }
+
+          before do
+            td.create_provider("bar")
+              .create_provider_version("4")
+              .create_provider_version_tag(provider_tags.first)
+              .add_day
+              .create_pact_with_hierarchy("foo", "1", "bar")
+              .create_consumer_version_tag("feat-x")
+              .add_day
+              .create_provider_version("5")
+              .create_provider_version_tag(provider_tags.last)
+          end
+
+          it "is wip for the first tag but not the second" do
+            expect(subject.first.pending_provider_tags).to eq [provider_tags.first]
+          end
+        end
       end
     end
   end

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

@@ -158,7 +158,11 @@ module PactBroker
 
       describe "find_for_verification integration test" do
         before do
-          td.create_pact_with_hierarchy("Foo", "1", "Bar")
+          td.create_provider("Bar")
+            .create_provider_version
+            .create_provider_version_tag("master")
+            .add_minute
+            .create_pact_with_hierarchy("Foo", "1", "Bar")
             .create_consumer_version_tag("feat-1", comment: "latest for feat-1")
             .create_consumer_version("2")
             .create_pact(comment: "overall latest")
@@ -189,6 +193,7 @@ module PactBroker
               include_wip_pacts_since: (Date.today - 1).to_datetime
             }
           end
+
           it "returns the WIP pacts as well as the specified pacts" do
             expect(subject.size).to eq 2
             expect(subject.last.consumer_version_number).to eq "1"

data/spec/lib/pact_broker/verifications/service_spec.rb

@@ -1,6 +1,7 @@
 require 'pact_broker/verifications/service'
 require 'pact_broker/verifications/repository'
 require 'pact_broker/webhooks/execution_configuration'
+require 'pact_broker/webhooks/trigger_service'
 
 module PactBroker
 
@@ -16,7 +17,7 @@ module PactBroker
 
       describe "#create" do
         before do
-          allow(PactBroker::Webhooks::Service).to receive(:trigger_webhooks)
+          allow(PactBroker::Webhooks::TriggerService).to receive(:trigger_webhooks_for_verification_results_publication)
           allow(webhook_execution_configuration).to receive(:with_webhook_context).and_return(webhook_execution_configuration)
         end
 
@@ -61,10 +62,9 @@ module PactBroker
 
         it "invokes the webhooks for the verification" do
           verification = create_verification
-          expect(PactBroker::Webhooks::Service).to have_received(:trigger_webhooks).with(
+          expect(PactBroker::Webhooks::TriggerService).to have_received(:trigger_webhooks_for_verification_results_publication).with(
             pact,
             verification,
-            PactBroker::Webhooks::WebhookEvent::VERIFICATION_PUBLISHED,
             options
           )
         end

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

@@ -136,6 +136,39 @@ module PactBroker
           include_examples "not triggering a contract_content_changed event"
         end
       end
+
+      describe "#trigger_webhooks_for_verification_results_publication" do
+        let(:verification) { double("verification", success: success) }
+        let(:success) { true }
+
+        subject { TriggerService.trigger_webhooks_for_verification_results_publication(pact, verification, webhook_options) }
+
+        context "when the verification is successful" do
+          it "triggers a provider_verification_succeeded webhook" do
+            expect(webhook_service).to receive(:trigger_webhooks).with(pact, verification, PactBroker::Webhooks::WebhookEvent::VERIFICATION_SUCCEEDED, webhook_options)
+            subject
+          end
+
+          it "triggers a provider_verification_published webhook" do
+            expect(webhook_service).to receive(:trigger_webhooks).with(pact, verification, PactBroker::Webhooks::WebhookEvent::VERIFICATION_PUBLISHED, webhook_options)
+            subject
+          end
+        end
+
+        context "when the verification is not successful" do
+          let(:success) { false }
+
+          it "triggers a provider_verification_failed webhook" do
+            expect(webhook_service).to receive(:trigger_webhooks).with(pact, verification, PactBroker::Webhooks::WebhookEvent::VERIFICATION_FAILED, webhook_options)
+            subject
+          end
+
+          it "triggeres a provider_verification_published webhook" do
+            expect(webhook_service).to receive(:trigger_webhooks).with(pact, verification, PactBroker::Webhooks::WebhookEvent::VERIFICATION_PUBLISHED, webhook_options)
+            subject
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.41.0
+  version: 2.42.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-01 00:00:00.000000000 Z
+date: 2019-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty