pact_broker 2.68.1 → 2.69.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1076b8629f5570c2304ec89fc169be77c2b6f54aaf832ceec91d5a939806f97
-  data.tar.gz: 28c09fcdf4d7abc16f367b8c6aaebfd3f3baaa68850ae5809aefb33d92bae8fa
+  metadata.gz: 03c656c61487fd81baf9eb94f73fa12ab27bdf5cea1bd2d670af63199123b6ef
+  data.tar.gz: '04022874b3eeb6681e79163431ce63c8d6760741dc7ec8db30cc87b8f9257a94'
 SHA512:
-  metadata.gz: 6fd730f1c2500942f680f66c4f526b138e71fd6f27a194b85fc280f9f1d959d6ecf79e88cb4aa685d451373cc9c3ac80714751a7d3658ec75c00f874925a8a39
-  data.tar.gz: 4327534a89cbaae5d76a86bb36aeb220668fd41805837923188e4ae1bfe2e3968d416b4c26338c6b80cc911552bb3f41db2ac0feef4a0bf70470820d1f780136
+  metadata.gz: ce0f9fb3186ab25c419b61665245977abfbaa8d245437699c44de54783bde86d8281b950172532d02a31f6aa33f36046dde7a0636075fabe75f3f074c33016c2
+  data.tar.gz: f6b8baa8a66b80b50df9223086f8e67dd9233106897b15f5cfa16328e954805de786d4fbe672f3cee5ba831001edd78f5c0a977dfc5d767d4c79aa46a61b1010

data/.github/workflows/release_gem.yml

@@ -19,11 +19,17 @@ jobs:
     #     checkInterval: 15
     #   env:
     #     GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    - uses: pact-foundation/release-gem@v0.0.11
+    - id: release-gem
+      uses: pact-foundation/release-gem@v0.0.11
       env:
         GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_API_KEY }}'
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
         INCREMENT: '${{ github.event.client_payload.increment }}'
+    outputs:
+      gem_name: "${{ steps.release-gem.outputs.gem_name }}"
+      version: "${{ steps.release-gem.outputs.version }}"
+      increment: "${{ steps.release-gem.outputs.increment }}"
+
   notify-gem-released:
     needs: release
     strategy:

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+<a name="v2.69.0"></a>
+### v2.69.0 (2020-11-24)
+
+#### Features
+
+* **wip**
+  * keep pacts as WIP when verified via the pactUrl passed though the webhook template parameters - experimental.	 ([a9b3fef0](/../../commit/a9b3fef0))
+
+* add link to the pact content version	 ([8eefba5f](/../../commit/8eefba5f))
+* display V3 provider states in HTML (#357)	 ([8e06a7f2](/../../commit/8e06a7f2))
+* optimise query for determining latest verification for consumer and provider	 ([7889b051](/../../commit/7889b051))
+
+#### Bug Fixes
+
+* return a 404 when the base pact for a pact diff doesn't exist	 ([74d3644d](/../../commit/74d3644d))
+* Add consumer name to inclusion reason log (#358)	 ([82901891](/../../commit/82901891))
+
 <a name="v2.68.1"></a>
 ### v2.68.1 (2020-10-24)
 

data/Gemfile

@@ -18,12 +18,13 @@ group :test do
   gem 'rspec-pact-matchers', '~>0.1'
   gem 'bundler-audit', '~>0.4'
   gem 'fakefs', '~>0.4'
-  gem 'webmock', '~>2.3'
+  gem 'webmock', '~>3.9'
   gem 'rspec', '~>3.0'
   gem 'rspec-its', '~>1.2'
   gem 'database_cleaner', '~>1.8', '>= 1.8.1'
   gem 'timecop', '~> 0.9'
   gem 'faraday', '~>0.15'
+  gem 'faraday_middleware', '~> 0.14'
   gem 'docker-api', '~>1.34'
   gem 'approvals', '>=0.0.1', '<1.0.0'
 end

data/db/ddl_statements/latest_verification_ids_for_consumer_and_provider.rb

@@ -0,0 +1,25 @@
+LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V1 = "select
+        pv.pacticipant_id as provider_id,
+        lpp.consumer_id,
+        max(v.id) as latest_verification_id
+      from verifications v
+      join latest_pact_publications_by_consumer_versions lpp
+        on v.pact_version_id = lpp.pact_version_id
+      join versions pv
+        on v.provider_version_id = pv.id
+      group by pv.pacticipant_id, lpp.consumer_id"
+
+LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V2 = "select
+        provider_id,
+        consumer_id,
+        max(id) as latest_verification_id
+        from verifications v
+        group by provider_id, consumer_id"
+
+
+LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V3 = "select
+        provider_id,
+        consumer_id,
+        max(verification_id) as latest_verification_id
+        from latest_verification_id_for_pact_version_and_provider_version v
+        group by provider_id, consumer_id"

data/db/migrations/20180524_create_latest_verifications_for_consumer_and_provider.rb

@@ -1,17 +1,10 @@
+require_relative '../ddl_statements/latest_verification_ids_for_consumer_and_provider'
+
 Sequel.migration do
   up do
-    # The latest verification id for each consumer version tag
+    # The latest verification id for each consumer/provider
     create_view(:latest_verification_ids_for_consumer_and_provider,
-      "select
-        pv.pacticipant_id as provider_id,
-        lpp.consumer_id,
-        max(v.id) as latest_verification_id
-      from verifications v
-      join latest_pact_publications_by_consumer_versions lpp
-        on v.pact_version_id = lpp.pact_version_id
-      join versions pv
-        on v.provider_version_id = pv.id
-      group by pv.pacticipant_id, lpp.consumer_id")
+      LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V1)
 
     # The most recent verification for each consumer/consumer version tag/provider
     latest_verifications = from(:verifications)

data/db/migrations/20180614_update_latest_verification_ids_for_consumer_and_provider.rb

@@ -1,27 +1,15 @@
+require_relative '../ddl_statements/latest_verification_ids_for_consumer_and_provider'
+
 Sequel.migration do
   up do
-    # The latest verification id for each consumer version tag
+    # The latest verification id for each consumer/provider
     create_or_replace_view(:latest_verification_ids_for_consumer_and_provider,
-      "select
-        provider_id,
-        consumer_id,
-        max(id) as latest_verification_id
-        from verifications v
-        group by provider_id, consumer_id")
+          LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V2)
   end
 
   down do
-    # The latest verification id for each consumer version tag
+    # The latest verification id for each consumer/provider
     create_or_replace_view(:latest_verification_ids_for_consumer_and_provider,
-      "select
-        pv.pacticipant_id as provider_id,
-        lpp.consumer_id,
-        max(v.id) as latest_verification_id
-      from verifications v
-      join latest_pact_publications_by_consumer_versions lpp
-        on v.pact_version_id = lpp.pact_version_id
-      join versions pv
-        on v.provider_version_id = pv.id
-      group by pv.pacticipant_id, lpp.consumer_id")
+      LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V1)
   end
 end

data/db/migrations/20201026_update_latest_verification_ids_for_consumer_and_provider.rb

@@ -0,0 +1,14 @@
+require_relative 'migration_helper'
+require_relative '../ddl_statements/latest_verification_ids_for_consumer_and_provider'
+
+Sequel.migration do
+  up do
+    create_or_replace_view(:latest_verification_ids_for_consumer_and_provider,
+      LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V3)
+  end
+
+  down do
+    create_or_replace_view(:latest_verification_ids_for_consumer_and_provider,
+      LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V2)
+  end
+end

data/lib/pact/doc/interaction_view_model.rb

@@ -8,6 +8,8 @@ module Pact
 
       include Pact::ActiveSupportSupport
 
+      MARKDOWN_BOLD_CHARACTERS = '**'
+
       def initialize interaction, consumer_contract
         @interaction = interaction
         @consumer_contract = consumer_contract
@@ -52,6 +54,16 @@ module Pact
         markdown_escape apply_capitals(@interaction.provider_state.strip, start_of_sentence)
       end
 
+      def formatted_provider_states mark_bold: false
+        bold_marker = mark_bold ? MARKDOWN_BOLD_CHARACTERS : ''
+
+        (@interaction.provider_states || []).map do |ps| 
+          "#{bold_marker}" \
+          "#{markdown_escape(apply_capitals(ps.name.strip, false))}" \
+          "#{bold_marker}"
+        end.join(' and ')
+      end
+
       def description start_of_sentence = false
         return '' unless @interaction.description
         markdown_escape apply_capitals(@interaction.description.strip, start_of_sentence)

data/lib/pact/doc/markdown/interaction.erb

@@ -1,6 +1,6 @@
-<a name="<%= interaction.id %>"></a>
-<%= if interaction.has_provider_state?
-  "Given **#{h(interaction.provider_state)}**, upon receiving"
+<a name="<%= interaction.id %>"></a><% formatted_provider_states = h(interaction.formatted_provider_states mark_bold: true) %>
+<%= if !formatted_provider_states.empty?
+  "Given #{formatted_provider_states}, upon receiving"
    else
   "Upon receiving"
    end

data/lib/pact/doc/markdown/interaction_renderer.rb

@@ -13,7 +13,8 @@ module Pact
         end
 
         def render_summary
-          suffix = interaction.has_provider_state? ? " given #{h(interaction.provider_state)}" : ""
+          formatted_provider_states = h(interaction.formatted_provider_states)
+          suffix = formatted_provider_states.empty? ? "" : " given #{formatted_provider_states}"
           "* [#{h(interaction.description(true))}](##{interaction.id})#{suffix}\n\n"
         end
 

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

@@ -50,6 +50,14 @@ module PactBroker
           }
         end
 
+        link :'pb:pact-version' do | options |
+          {
+            title: "Pact content version permalink",
+            name: represented.pact_version_sha,
+            href: pact_version_url(represented, options.fetch(:base_url))
+          }
+        end
+
         link :'pb:latest-pact-version' do | options |
           {
             title: "Latest version of this pact",

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

@@ -15,7 +15,7 @@ module PactBroker
         end
 
         def resource_exists?
-          consumer && provider
+          pact
         end
 
         def to_text

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

@@ -51,7 +51,7 @@ module PactBroker
         end
 
         def policy_name
-          :'webhooks::webhooks'
+          request.post? ? :'webhooks::webhook' : :'webhooks::webhooks'
         end
 
         private

data/lib/pact_broker/db/clean.rb

@@ -25,17 +25,17 @@ module PactBroker
       end
 
       def keep
-        options[:keep] || [PactBroker::Matrix::UnresolvedSelector.new(tag: true, latest: true)]
+        options[:keep] || [PactBroker::Matrix::UnresolvedSelector.new(tag: true, latest: true), PactBroker::Matrix::UnresolvedSelector.new(latest: true)]
       end
 
-      def resolve_ids(query)
+      def resolve_ids(query, column_name = :id)
         # query
-        Unionable.new(query.collect { |h| h[:id] })
+        Unionable.new(query.collect { |h| h[column_name] })
       end
 
       def pact_publication_ids_to_keep
         @pact_publication_ids_to_keep ||= pact_publication_ids_to_keep_for_version_ids_to_keep
-                                            .union(pact_publications_to_keep_for_verification_ids_to_keep)
+                                            .union(latest_pact_publication_ids_to_keep)
                                             .union(latest_tagged_pact_publications_ids_to_keep)
       end
 
@@ -43,16 +43,17 @@ module PactBroker
         @pact_publication_ids_to_keep_for_version_ids_to_keep ||= resolve_ids(db[:pact_publications].select(:id).where(consumer_version_id: version_ids_to_keep))
       end
 
-      def pact_publications_to_keep_for_verification_ids_to_keep
-        @pact_publications_to_keep_for_verification_ids_to_keep ||= resolve_ids(db[:pact_publications].select(:id).where(pact_version_id: db[:verifications].select(:pact_version_id).where(id: verification_ids_to_keep_for_version_ids_to_keep)))
-      end
-
       def latest_tagged_pact_publications_ids_to_keep
         @latest_tagged_pact_publications_ids_to_keep ||= resolve_ids(keep.select(&:tag).select(&:latest).collect do | selector |
           PactBroker::Pacts::LatestTaggedPactPublications.select(:id).for_selector(selector)
         end.reduce(&:union))
       end
 
+
+      def latest_pact_publication_ids_to_keep
+        @latest_pact_publication_ids_to_keep ||= resolve_ids(db[:latest_pact_publications].select(:id))
+      end
+
       def pact_publication_ids_to_delete
         @pact_publication_ids_to_delete ||= resolve_ids(db[:pact_publications].select(:id).where(id: pact_publication_ids_to_keep).invert)
       end
@@ -62,12 +63,31 @@ module PactBroker
         @verification_ids_to_keep_for_version_ids_to_keep ||= resolve_ids(db[:verifications].select(:id).where(provider_version_id: version_ids_to_keep))
       end
 
+      def verification_ids_to_keep_because_latest_verification_for_latest_pact
+        @verification_ids_to_keep_because_latest_verification ||= resolve_ids(
+          db[:latest_verification_ids_for_pact_versions]
+            .select(:latest_verification_id)
+            .where(pact_version_id:
+              db[:latest_pact_publications].select(:pact_version_id)
+            ),
+          :latest_verification_id
+        )
+      end
+
       def verification_ids_to_keep_for_pact_publication_ids_to_keep
-        @verification_ids_to_keep_for_pact_publication_ids_to_keep ||= resolve_ids(db[:verifications].select(:id).where(pact_version_id: db[:pact_publications].select(:pact_version_id).where(id: pact_publication_ids_to_keep_for_version_ids_to_keep)))
+        @verification_ids_to_keep_for_pact_publication_ids_to_keep ||= resolve_ids(
+          db[:latest_verification_id_for_pact_version_and_provider_version]
+            .select(:verification_id)
+            .where(pact_version_id:
+              db[:pact_publications]
+                .select(:pact_version_id)
+                .where(id: pact_publication_ids_to_keep_for_version_ids_to_keep)
+          )
+        )
       end
 
       def verification_ids_to_keep
-        @verification_ids_to_keep ||= verification_ids_to_keep_for_version_ids_to_keep.union(verification_ids_to_keep_for_pact_publication_ids_to_keep)
+        @verification_ids_to_keep ||= verification_ids_to_keep_for_version_ids_to_keep.union(verification_ids_to_keep_because_latest_verification_for_latest_pact)
       end
 
       def verification_ids_to_delete

data/lib/pact_broker/matrix/unresolved_selector.rb

@@ -17,6 +17,10 @@ module PactBroker
         !!latest
       end
 
+      def overall_latest?
+        latest? && !tag && !max_age
+      end
+
       def latest
         self[:latest]
       end

data/lib/pact_broker/pacts/latest_pact_publications.rb

@@ -8,6 +8,21 @@ module PactBroker
     class LatestPactPublications < LatestPactPublicationsByConsumerVersion
       set_dataset(:latest_pact_publications)
 
+      # def dataset_module
+      #   def where_age_less_than(days)
+      #     start_date = Date.today - days
+      #     where{ latest_pact_publications[:created_at] >= start_date }
+      #   end
+
+      #   def for_selector(selector)
+      #     query = self
+      #     query = query.where(consumer_name: selector.pacticipant_name) if selector.pacticipant_name
+      #     query = query.where(tag_name: selector.tag) if selector.tag && selector.tag.is_a?(String)
+      #     query = query.where_age_less_than(selector.max_age) if selector.max_age
+      #     query
+      #   end
+      # end
+
       # This pact may well be the latest for certain tags, but in this query
       # we don't know what they are
       def to_domain

data/lib/pact_broker/pacts/metadata.rb

@@ -1,3 +1,5 @@
+require 'pact_broker/feature_toggle'
+
 module PactBroker
   module Pacts
     module Metadata
@@ -27,10 +29,12 @@ module PactBroker
       # parameters. This is part of ensuring that verification results webhooks
       # go back to the correct consumer version number (eg for git statuses)
       def build_metadata_for_webhook_triggered_by_pact_publication(pact)
-        {
+        metadata = {
           consumer_version_number: pact.consumer_version_number,
           consumer_version_tags: pact.consumer_version_tag_names
         }
+        metadata[:wip] = "true" if PactBroker.feature_enabled?(:experimental_webhook_wip)
+        metadata
       end
     end
   end

data/lib/pact_broker/pacts/verifiable_pact_messages.rb

@@ -29,7 +29,7 @@ module PactBroker
         version_text = head_consumer_tags.size == 1 ? "version" : "versions"
         if wip?
           # WIP pacts will always have tags, because it is part of the definition of being a WIP pact
-          "The pact at #{pact_version_url} is being verified because it is a 'work in progress' pact (ie. it is the pact for the latest #{version_text} of Foo tagged with #{joined_head_consumer_tags} and is still in pending state). #{READ_MORE_WIP}"
+          "The pact at #{pact_version_url} is being verified because it is a 'work in progress' pact (ie. it is the pact for the latest #{version_text} of #{consumer_name} tagged with #{joined_head_consumer_tags} and is still in pending state). #{READ_MORE_WIP}"
         else
           criteria_or_criterion = selectors.size > 1 ? "criteria" : "criterion"
           "The pact at #{pact_version_url} is being verified because it matches the following configured selection #{criteria_or_criterion}: #{selector_descriptions}#{same_content_note}"

data/lib/pact_broker/tasks/clean_task.rb

@@ -3,6 +3,7 @@ module PactBroker
     class CleanTask < ::Rake::TaskLib
 
       attr_accessor :database_connection
+      attr_accessor :keep
 
       def initialize &block
         rake_task &block
@@ -11,11 +12,24 @@ module PactBroker
       def rake_task &block
         namespace :pact_broker do
           namespace :db do
-            desc "Clean unused pacts and verifications from database"
+            desc "Clean unnecessary pacts and verifications from database"
             task :clean do | t, args |
-              require 'pact_broker/db/clean'
+
               instance_eval(&block)
-              PactBroker::DB::Clean.call(database_connection)
+
+              require 'pact_broker/db/clean'
+              require 'pact_broker/matrix/unresolved_selector'
+              require 'yaml'
+
+              keep_selectors = nil
+              if keep
+                keep_selectors = [*keep].collect do | hash |
+                  PactBroker::Matrix::UnresolvedSelector.new(hash)
+                end
+              end
+              # TODO time it
+              results = PactBroker::DB::Clean.call(database_connection, keep: keep_selectors)
+              puts results.to_yaml
             end
           end
         end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.68.1'
+  VERSION = '2.69.0'
 end

data/pact_broker.gemspec

@@ -53,7 +53,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'semver2', '~> 3.4.2'
   gem.add_runtime_dependency 'rack', '>= 2.2.3', '~> 2.2'
   gem.add_runtime_dependency 'redcarpet', '>=3.3.2', '~>3.3'
-  gem.add_runtime_dependency 'pact-support', '~> 1.14', '>= 1.14.1'
+  gem.add_runtime_dependency 'pact-support', '1.15.0'
   gem.add_runtime_dependency 'padrino-core', '>= 0.14.3', '~> 0.14'
   gem.add_runtime_dependency 'sinatra', '>= 2.0.8.1', '< 3.0'
   gem.add_runtime_dependency 'haml', '~>5.0'

data/spec/lib/pact/doc/interaction_view_model_spec.rb

@@ -181,6 +181,52 @@ module Pact
           end
         end
       end
+
+      describe "formatted_provider_states" do
+        let(:consumer_contract) { Pact::ConsumerContract.from_uri './spec/support/markdown_pact.json' }
+        let(:interaction) { consumer_contract.interactions.first }
+
+        context "when no provider state" do
+          let(:interaction) { consumer_contract.interactions.last }
+
+          it "returns an empty string" do
+            expect(subject.formatted_provider_states).to eq ""
+          end
+        end
+
+        context "when marking provider states in bold" do
+          it "formats the provider state in bold" do
+            expect(subject.formatted_provider_states mark_bold: true).to eq "**alligators exist**"
+          end
+        end
+        
+        context "when not marking provider states in bold" do
+          it "formats the provider state without bold" do
+            expect(subject.formatted_provider_states).to eq "alligators exist"
+          end
+        end
+
+        context "when using v3 specification" do
+          let(:consumer_contract) { Pact::ConsumerContract.from_uri './spec/support/markdown_pact_v3.json' }
+          let(:interaction) { consumer_contract.interactions.first }
+
+          context "when marking provider states in bold" do
+            it "formats the provider states in bold" do
+              expected_result = '**alligators exist** and **the city of Tel Aviv has a zoo** ' \
+                                'and **the zoo keeps record of its alligator population**'
+              expect(subject.formatted_provider_states mark_bold: true).to eq expected_result
+            end
+          end
+
+          context "when not marking provider states in bold" do
+            it "formats the provider states without bold" do
+              expected_result = 'alligators exist and the city of Tel Aviv has a zoo ' \
+                                'and the zoo keeps record of its alligator population'
+              expect(subject.formatted_provider_states).to eq expected_result
+            end
+          end
+        end
+      end
     end
   end
 end

data/spec/lib/pact/doc/markdown/consumer_contract_renderer_spec.rb

@@ -12,6 +12,17 @@ module Pact
         subject { ConsumerContractRenderer.new(consumer_contract) }
 
         describe "#call" do
+          context "when using V3 specification" do
+            context "when an interaction has multiple provider states" do
+              let(:consumer_contract) { Pact::ConsumerContract.from_uri './spec/support/markdown_pact_v3.json' }
+
+              it "displays all provider states in the interaction title" do
+                expect(subject.call).to include 'Given **alligators exist** and **the city of Tel Aviv has a zoo** ' \
+                                                'and **the zoo keeps record of its alligator population**, upon receiving'
+              end
+            end
+          end
+
           context "with markdown characters in the pacticipant names" do
             let(:consumer_contract) { Pact::ConsumerContract.from_uri './spec/support/markdown_pact_with_markdown_chars_in_names.json' }
 

data/spec/lib/pact_broker/api/pact_broker_urls_spec.rb

@@ -107,7 +107,7 @@ module PactBroker
 
       describe "webhook metadata" do
         let(:expected_metadata) do
-          { consumer_version_number: "123/456", consumer_version_tags: %w[dev] }
+          { consumer_version_number: "123/456", consumer_version_tags: %w[dev], wip: "true" }
         end
 
         it "builds the webhook metadata" do

data/spec/lib/pact_broker/db/clean_spec.rb

@@ -33,6 +33,8 @@ module PactBroker
               .create_pact
               .create_consumer_version("6", tag_names: %w{foo})
               .create_pact
+              .create_consumer_version("7")
+              .create_pact
           end
 
           let(:options) { { keep: [all_prod_selector, latest_dev_selector] } }
@@ -43,12 +45,14 @@ module PactBroker
             expect(PactBroker::Domain::Version.where(number: "4").count).to be 1
             expect(PactBroker::Domain::Version.where(number: "5").count).to be 1
             expect(PactBroker::Domain::Version.where(number: "6").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "7").count).to be 1
             subject
             expect(PactBroker::Domain::Version.where(number: "1").count).to be 1
             expect(PactBroker::Domain::Version.where(number: "3").count).to be 1
             expect(PactBroker::Domain::Version.where(number: "4").count).to be 0
             expect(PactBroker::Domain::Version.where(number: "5").count).to be 1
             expect(PactBroker::Domain::Version.where(number: "6").count).to be 0
+            expect(PactBroker::Domain::Version.where(number: "7").count).to be 1 # doesn't delete overall latest
           end
         end
 
@@ -97,12 +101,6 @@ module PactBroker
             }.by(-1)
           end
 
-          it "does not delete the pact publication that belongs to the latest verification" do
-            expect{ subject }.to_not change {
-              PactBroker::Pacts::PactPublication.where(consumer_version: PactBroker::Domain::Version.where_pacticipant_name("Foo").where(number: "2")).count
-            }
-          end
-
           it "deletes the pact publication that does not belongs to the latest verification" do
             expect{ subject }.to change {
               PactBroker::Pacts::PactPublication.where(consumer_version: PactBroker::Domain::Version.where_pacticipant_name("Foo").where(number: "1")).count
@@ -110,8 +108,6 @@ module PactBroker
           end
         end
 
-
-
         context "with orphan pact versions" do
           before do
             # Create a pact that will not be deleted

data/spec/support/markdown_pact_v3.json

@@ -0,0 +1,44 @@
+{
+  "provider": {
+    "name": "Some Provider"
+  },
+  "consumer": {
+    "name": "Some Consumer"
+  },
+  "interactions": [
+    {
+      "description": "a request to list all alligators in Tel Aviv",
+      "providerStates": [
+        {"name": "alligators exist", "params" : {}}, 
+        {"name": "the city of Tel Aviv has a zoo", "params" : {}},
+        {"name": "the zoo keeps record of its alligator population", "params" : {}}
+      ],
+      "params": {},
+      "request": {
+        "method": "get",
+        "path": "/alligators"
+      },
+      "response": {
+        "headers" : {"Content-Type": "application/json"},
+        "status" : 200,
+        "body" : {
+          "alligators": [{
+            "name": "Bob",
+            "phoneNumber" : {
+              "json_class": "Pact::Term",
+              "data": {
+                "generate": "12345678",
+                "matcher": {"json_class":"Regexp","o":0,"s":"\\d+"}
+              }
+            }
+          }]
+        }
+      }
+    }
+  ],
+  "metadata": {
+    "pactSpecification": {
+      "version": "3.0.0"
+    }
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.68.1
+  version: 2.69.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-25 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -174,22 +174,16 @@ dependencies:
   name: pact-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.14.1
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.14.1
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: padrino-core
   requirement: !ruby/object:Gem::Requirement
@@ -403,6 +397,7 @@ files:
 - db/ddl_statements/latest_pact_publications_by_consumer_versions.rb
 - db/ddl_statements/latest_tagged_pact_consumer_version_orders.rb
 - db/ddl_statements/latest_triggered_webhooks.rb
+- db/ddl_statements/latest_verification_ids_for_consumer_and_provider.rb
 - db/ddl_statements/latest_verification_ids_for_consumer_version_tags.rb
 - db/ddl_statements/latest_verification_ids_for_pact_versions.rb
 - db/migrations/000001_create_pacticipant_table.rb
@@ -523,6 +518,7 @@ files:
 - db/migrations/20201006_add_wip_to_verification.rb
 - db/migrations/20201023_create_verification_number_sequence.rb
 - db/migrations/20201024_create_version_order_sequence.rb
+- db/migrations/20201026_update_latest_verification_ids_for_consumer_and_provider.rb
 - db/migrations/migration_helper.rb
 - db/test/backwards_compatibility/.rspec
 - db/test/backwards_compatibility/Appraisals
@@ -1357,6 +1353,7 @@ files:
 - spec/support/interaction_view_model_with_terms.json
 - spec/support/logging.rb
 - spec/support/markdown_pact.json
+- spec/support/markdown_pact_v3.json
 - spec/support/markdown_pact_with_html.json
 - spec/support/markdown_pact_with_markdown_chars_in_names.json
 - spec/support/metadata_test_server.rb
@@ -1751,6 +1748,7 @@ test_files:
 - spec/support/interaction_view_model_with_terms.json
 - spec/support/logging.rb
 - spec/support/markdown_pact.json
+- spec/support/markdown_pact_v3.json
 - spec/support/markdown_pact_with_html.json
 - spec/support/markdown_pact_with_markdown_chars_in_names.json
 - spec/support/metadata_test_server.rb