pact_broker 2.51.0 → 2.52.0

data/spec/lib/pact_broker/api/renderers/html_pact_renderer_spec.rb

@@ -12,7 +12,7 @@ module PactBroker
           ENV['TZ'] = "Australia/Melbourne"
           PactBroker.configuration.enable_public_badge_access = true
           allow(PactBroker::Api::PactBrokerUrls).to receive(:pact_url).with('http://base', pact).and_return(pact_url)
-          allow(PactBroker::Api::PactBrokerUrls).to receive(:matrix_for_pacticipant_version_url).with(consumer_version, 'http://base').and_return(matrix_url)
+          allow(PactBroker::Api::PactBrokerUrls).to receive(:matrix_for_pact_url).with(pact, 'http://base').and_return(matrix_url)
           allow_any_instance_of(HtmlPactRenderer).to receive(:logger).and_return(logger)
 
           Timecop.freeze(created_at + 3)
@@ -95,6 +95,7 @@ module PactBroker
             before do
               allow(pact).to receive(:content_hash).and_return(content_hash)
             end
+
             let(:json_content) { '[1]' }
             let(:content_hash) { [1] }
 

data/spec/lib/pact_broker/matrix/every_row_spec.rb

@@ -8,13 +8,6 @@ module PactBroker
       let(:bar) { PactBroker::Domain::Pacticipant.where(name: "Bar").single_record }
       let(:wiffle) { PactBroker::Domain::Pacticipant.where(name: "Wiffle").single_record }
 
-      describe "ALL_COLUMNS" do
-        it "has the same first column as QuickRow - this is required so that they both sort the same" do
-          expect(EveryRow::ALL_COLUMNS.first).to eq QuickRow::LAST_ACTION_DATE
-          expect(EveryRow::ALL_COLUMNS.first).to eq QuickRow::ALL_COLUMNS.first
-        end
-      end
-
       describe "matching_selectors" do
         before do
           td.create_pact_with_verification("Foo", "1", "Bar", "2")
@@ -58,7 +51,6 @@ module PactBroker
           EveryRow
             .select_all_columns
             .join_verifications
-            .join_pacticipants_and_pacticipant_versions
             .eager_all_the_things
             .all
         end
@@ -99,7 +91,6 @@ module PactBroker
           EveryRow
             .select_all_columns
             .join_verifications
-            .join_pacticipants_and_pacticipant_versions
             .all
         end
 
@@ -129,7 +120,6 @@ module PactBroker
           EveryRow
             .select_all_columns
             .join_verifications_for(query_ids)
-            .join_pacticipants_and_pacticipant_versions
             .all
         end
 

data/spec/lib/pact_broker/matrix/quick_row_spec.rb

@@ -38,20 +38,20 @@ module PactBroker
           before do
             td.create_consumer("Foo")
               .create_provider("Bar")
-              .create_consumer_version("10", created_at: cv_created_at_1)
-              .create_pact
-              .create_verification(provider_version: "2", created_at: pv_created_at)
-              .create_consumer_version("3", created_at: cv_created_at_2)
-              .create_pact
-              .create_verification(provider_version: "2")
+              .create_consumer_version("10")
+              .create_pact(created_at: day_1)
+              .create_verification(provider_version: "2", created_at: day_3)
+              .create_consumer_version("3")
+              .create_pact(created_at: day_2)
+              .create_verification(provider_version: "2", created_at: day_3)
           end
 
-          let(:cv_created_at_1) { DateTime.now + 1  }
-          let(:cv_created_at_2) { DateTime.now + 2  }
-          let(:pv_created_at) { DateTime.now + 3  }
+          let(:day_1) { DateTime.now + 1  }
+          let(:day_2) { DateTime.now + 2  }
+          let(:day_3) { DateTime.now + 3  }
 
-
-          it "orders by the consumer version" do
+          it "orders by the pact publication id desc" do
+            expect(subject.first.last_action_date).to eq subject.last.last_action_date
             expect(subject.first.consumer_version_number).to eq "3"
             expect(subject.last.consumer_version_number).to eq "10"
           end

data/spec/lib/pact_broker/matrix/repository_dependency_spec.rb

@@ -7,7 +7,7 @@ module PactBroker
 
       def build_selectors(hash)
         hash.collect do | key, value |
-          { pacticipant_name: key, pacticipant_version_number: value }
+          UnresolvedSelector.new(pacticipant_name: key, pacticipant_version_number: value)
         end
       end
 

data/spec/lib/pact_broker/matrix/repository_spec.rb

@@ -359,8 +359,8 @@ module PactBroker
 
           it "returns a row for each verification for that version" do
             expect(subject.size).to eq 2
-            expect(subject.collect{|r| r[:consumer_version_number]}.sort).to eq ["1.2.3", "1.2.3"]
-            expect(subject.collect{|r| r[:provider_version_number]}.sort).to eq ["4.5.6", "6.7.8"]
+            expect(subject.collect(&:consumer_version_number).sort).to eq ["1.2.3", "1.2.3"]
+            expect(subject.collect(&:provider_version_number).sort).to eq ["4.5.6", "6.7.8"]
           end
         end
 
@@ -376,8 +376,8 @@ module PactBroker
           let(:selectors) { build_selectors("A" => nil) }
 
           it "returns a row for each verification for the pacticipant" do
-            expect(subject.collect{|r| r[:consumer_name]}.uniq).to eq ["A"]
-            provider_version_numbers = subject.collect{|r| r[:provider_version_number]}
+            expect(subject.collect(&:consumer_name).uniq).to eq ["A"]
+            provider_version_numbers = subject.collect(&:provider_version_number)
             expect(provider_version_numbers).to include nil
             expect(provider_version_numbers).to include "4.5.6"
           end
@@ -398,8 +398,8 @@ module PactBroker
 
           it "returns a row for each verification for that version" do
             expect(subject.size).to eq 2
-            expect(subject.collect{|r| r[:consumer_version_number]}.sort).to eq ["1.2.3", "3.4.5"]
-            expect(subject.collect{|r| r[:provider_version_number]}.sort).to eq ["4.5.6", "4.5.6"]
+            expect(subject.collect(&:consumer_version_number).sort).to eq ["1.2.3", "3.4.5"]
+            expect(subject.collect(&:provider_version_number).sort).to eq ["4.5.6", "4.5.6"]
           end
         end
 
@@ -422,8 +422,8 @@ module PactBroker
 
           it "returns a row for each verification for that version" do
             expect(subject.size).to eq 3
-            expect(subject.collect{|r| r[:consumer_version_number]}.sort).to eq ["1.2.3", "3.4.5", "3.4.5"]
-            expect(subject.collect{|r| r[:provider_version_number]}.sort).to eq ["4.5.6", "4.5.6", "6.7.8"]
+            expect(subject.collect(&:consumer_version_number).sort).to eq ["1.2.3", "3.4.5", "3.4.5"]
+            expect(subject.collect(&:provider_version_number).sort).to eq ["4.5.6", "4.5.6", "6.7.8"]
           end
         end
 
@@ -565,7 +565,7 @@ module PactBroker
 
             it "returns all matching rows" do
               # postgres orders differently, and ruby array sort blows up with a nil string
-              provider_version_numbers = subject.collect{ |r| r[:provider_version_number]}
+              provider_version_numbers = subject.collect(&:provider_version_number)
               expect(provider_version_numbers).to include nil
               expect(provider_version_numbers).to include "2.0.0"
               expect(provider_version_numbers.size).to eq 2

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

@@ -72,6 +72,17 @@ module PactBroker
           it "sets the latest_consumer_version_tag_names" do
             expect(find_by_consumer_version_number("foo-latest-prod-version").selectors.collect(&:tag)).to eq ['prod']
           end
+
+          context "when a consumer name is specified", pending: "not yet implemented, but will do" do
+            let(:consumer_version_selectors) do
+              Selectors.new(Selector.all_for_tag_and_consumer('prod', 'Foo'))
+            end
+
+            it "only returns the pacts for that consumer" do
+              expect(subject.size).to eq 3
+              expect(find_by_consumer_version_number("foo-latest-prod-version").selectors).to eq [Selector.all_for_tag_and_consumer('prod', 'Foo')]
+            end
+          end
         end
 
         context "when all versions with a given tag are requested" do
@@ -99,7 +110,38 @@ module PactBroker
             td.create_consumer_version("prod-version-3", tag_names: %w[prod])
               .republish_same_pact
             expect(subject.size).to be 2
-            expect(subject.collect(&:consumer_version_number)).to eq %w[prod-version-1 prod-version-3]
+            expect(subject.collect(&:consumer_version_number).sort).to eq %w[prod-version-1 prod-version-3]
+          end
+        end
+
+        context "when all versions with a given tag for a given consumer are requested" do
+          before do
+            td.create_pact_with_hierarchy("Foo2", "prod-version-1", "Bar2")
+              .create_consumer_version_tag("prod")
+              .create_consumer_version("not-prod-version", tag_names: %w[master])
+              .create_pact
+              .create_consumer_version("prod-version-2", tag_names: %w[prod])
+              .create_pact
+              .create_consumer("Foo3")
+              .create_consumer_version("prod-version-3", tag_names: %w[prod])
+              .create_pact
+          end
+
+          let(:consumer_version_selectors) { Selectors.new(pact_selector_1) }
+          let(:pact_selector_1) { Selector.all_for_tag_and_consumer('prod', "Foo2") }
+
+          subject { Repository.new.find_for_verification("Bar2", consumer_version_selectors) }
+
+          it "returns all the versions with the specified tag and consumer" do
+            expect(subject.size).to be 2
+            expect(find_by_consumer_version_number("prod-version-1")).to_not be nil
+            expect(find_by_consumer_version_number("prod-version-2")).to_not be nil
+            expect(find_by_consumer_version_number("prod-version-3")).to be nil
+          end
+
+          it "sets the selectors" do
+            expect(find_by_consumer_version_number("prod-version-1").selectors.first.tag).to eq 'prod'
+            expect(find_by_consumer_version_number("prod-version-1").selectors.first.consumer).to eq 'Foo2'
           end
         end
 

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

@@ -53,6 +53,15 @@ module PactBroker
           expect(subject.created_at).to be_datey
         end
 
+        it "creates a LatestPactPublicationIdForConsumerVersion" do
+          expect{ subject }.to change { LatestPactPublicationIdForConsumerVersion.count }.by(1)
+        end
+
+        it "sets the created_at of the LatestPactPublicationIdForConsumerVersion to the same as the consumer version, because that's how pacts are ordered" do
+          subject
+          expect(LatestPactPublicationIdForConsumerVersion.first.created_at).to eq PactBroker::Domain::Version.find(number: subject.consumer_version_number).created_at
+        end
+
         context "when a pact already exists with exactly the same content" do
           let(:another_version) { Versions::Repository.new.create number: '2.0.0', pacticipant_id: consumer.id }
 

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

@@ -8,15 +8,18 @@ module PactBroker
         let(:overall_latest_2) { Selector.overall_latest }
         let(:latest_for_tag_prod) { Selector.latest_for_tag('prod') }
         let(:latest_for_tag_dev) { Selector.latest_for_tag('dev') }
+        let(:all_prod_for_consumer_1) { Selector.all_for_tag_and_consumer('prod', 'Foo') }
+        let(:all_prod_for_consumer_2) { Selector.all_for_tag_and_consumer('prod', 'Bar') }
+        let(:all_dev_for_consumer_1) { Selector.all_for_tag_and_consumer('dev', 'Bar') }
         let(:all_prod) { Selector.all_for_tag('prod') }
         let(:all_dev) { Selector.all_for_tag('dev') }
 
         let(:unsorted_selectors) do
-          [all_prod, all_dev, latest_for_tag_prod, overall_latest_1, overall_latest_1, latest_for_tag_dev]
+          [all_prod, all_dev, all_dev_for_consumer_1, latest_for_tag_prod, overall_latest_1, overall_latest_1, latest_for_tag_dev, all_prod_for_consumer_2, all_prod_for_consumer_1]
         end
 
         let(:expected_sorted_selectors) do
-          [overall_latest_1, overall_latest_1, latest_for_tag_dev, latest_for_tag_prod, all_dev, all_prod]
+          [overall_latest_1, overall_latest_1, latest_for_tag_dev, latest_for_tag_prod, all_dev_for_consumer_1, all_prod_for_consumer_2, all_prod_for_consumer_1, all_dev, all_prod]
         end
 
         it "sorts the selectors" do

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

@@ -67,6 +67,12 @@ module PactBroker
 
           its(:inclusion_reason) { is_expected.to include "The pact at http://pact is being verified because it matches the following configured selection criterion: pacts for all consumer versions tagged 'prod'"}
         end
+
+        context "when the pact is one of all versions for a tag and consumer" do
+          let(:selectors) { Selectors.new(Selector.all_for_tag_and_consumer('prod', 'Foo')) }
+
+          its(:inclusion_reason) { is_expected.to include "The pact at http://pact is being verified because it matches the following configured selection criterion: pacts for all Foo versions tagged 'prod'"}
+        end
       end
 
       describe "#pending_reason" do

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

@@ -3,6 +3,27 @@ require 'pact_broker/verifications/repository'
 module PactBroker
   module Verifications
     describe Repository do
+      describe "#create" do
+        let(:verification) do
+          PactBroker::Domain::Verification.new(success: true)
+        end
+
+        let(:provider_version_number) { "2" }
+        let(:pact) do
+          td.create_pact_with_hierarchy("Foo", "1", "Bar").and_return(:pact)
+        end
+
+        subject { Repository.new.create verification, provider_version_number, pact}
+
+        it "creates a LatestVerificationIdForPactVersionAndProviderVersion" do
+          expect { subject }.to change { LatestVerificationIdForPactVersionAndProviderVersion.count }.by(1)
+        end
+
+        it "sets the created_at of the LatestVerificationIdForPactVersionAndProviderVersion to the same as the verification" do
+          expect(subject.created_at).to eq LatestVerificationIdForPactVersionAndProviderVersion.first.created_at
+        end
+      end
+
       describe "#find" do
         let!(:pact) do
           builder = TestDataBuilder.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.51.0
+  version: 2.52.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -30,22 +30,16 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: roar
   requirement: !ruby/object:Gem::Requirement
@@ -765,6 +759,8 @@ files:
 - db/migrations/20191030_optimise_latest_pact_publications_by_consumer_versions_.rb
 - db/migrations/20191031_optimise_latest_verification_ids_for_consumer_version_tags.rb
 - db/migrations/20191101_create_head_pact_tags.rb
+- db/migrations/20200318_add_created_at_to_latest_pact_publications.rb
+- db/migrations/20200319_add_created_at_to_latest_verifications.rb
 - db/migrations/migration_helper.rb
 - db/test/backwards_compatibility/.rspec
 - db/test/backwards_compatibility/Appraisals
@@ -952,6 +948,8 @@ files:
 - lib/pact_broker/db/data_migrations/helpers.rb
 - lib/pact_broker/db/data_migrations/migrate_webhook_headers.rb
 - lib/pact_broker/db/data_migrations/set_consumer_ids_for_pact_publications.rb
+- lib/pact_broker/db/data_migrations/set_created_at_for_latest_pact_publications.rb
+- lib/pact_broker/db/data_migrations/set_created_at_for_latest_verifications.rb
 - lib/pact_broker/db/data_migrations/set_latest_version_sequence_value.rb
 - lib/pact_broker/db/data_migrations/set_pacticipant_ids_for_verifications.rb
 - lib/pact_broker/db/data_migrations/set_webhooks_enabled.rb