pact_broker 2.71.0 → 2.72.0

data/spec/lib/pact_broker/domain/tag_spec.rb

@@ -18,15 +18,29 @@ module PactBroker
           .create_consumer_version_tag("test")
       end
 
-      it "returns the latest tags for the given pacticipant ids" do
-        pacticipant = PactBroker::Domain::Pacticipant.order(:id).first
-        tags = Tag.latest_tags_for_pacticipant_ids([pacticipant.id]).all
-        expect(tags.collect(&:name).sort).to eq %w{bloop dev prod}
-        expect(tags.find{ |t| t.name == "dev" }.version.number).to eq "3"
-        expect(tags.find{ |t| t.name == "prod" }.version.number).to eq "1"
-        expect(tags.find{ |t| t.name == "bloop" }.version.number).to eq "2"
-        expect(tags.collect(&:version_id).compact.size).to eq 3
-        expect(tags.collect(&:created_at).compact.size).to eq 3
+      describe "#latest_tags_for_pacticipant_ids" do
+        it "returns the latest tags for the given pacticipant ids" do
+          pacticipant = PactBroker::Domain::Pacticipant.order(:id).first
+          tags = Tag.latest_tags_for_pacticipant_ids([pacticipant.id]).all
+          expect(tags.collect(&:name).sort).to eq %w{bloop dev prod}
+          expect(tags.find{ |t| t.name == "dev" }.version.number).to eq "3"
+          expect(tags.find{ |t| t.name == "prod" }.version.number).to eq "1"
+          expect(tags.find{ |t| t.name == "bloop" }.version.number).to eq "2"
+          expect(tags.collect(&:version_id).compact.size).to eq 3
+          expect(tags.collect(&:created_at).compact.size).to eq 3
+        end
+      end
+
+      describe "latest_tags" do
+        it "returns the tags that belong to the most recent version with that tag/pacticipant" do
+          tags = Tag.latest_tags.all
+          expect(tags.collect(&:name).sort).to eq %w{bloop dev prod test}
+          expect(tags.find{ |t| t.name == "dev" }.version.number).to eq "3"
+          expect(tags.find{ |t| t.name == "prod" }.version.number).to eq "1"
+          expect(tags.find{ |t| t.name == "bloop" }.version.number).to eq "2"
+          expect(tags.collect(&:version_id).compact.size).to eq 4
+          expect(tags.collect(&:created_at).compact.size).to eq 4
+        end
       end
     end
   end

data/spec/lib/pact_broker/domain/verification_spec.rb

@@ -4,6 +4,55 @@ module PactBroker
 
   module Domain
     describe Verification do
+      describe "latest_verifications_for_all_consumer_version_tags" do
+        before do
+          td.create_pact_with_verification_and_tags("Foo", "1", ["fmain"], "Bar", "2")
+            .create_pact_with_verification_and_tags("Foo", "3", ["fmain"], "Bar", "4")
+            .create_pact_with_verification_and_tags("Foo", "5", ["fmain"], "Bar", "5")
+            .create_pact_with_verification_and_tags("Foo", "6", ["other"], "Bar", "5")
+            .create_pact_with_verification_and_tags("Foo2", "6", ["fprod"], "Bar", "7")
+            .create_pact_with_verification_and_tags("Ignored", "6", ["fmain"], "Bar", "8")
+        end
+
+        subject { Verification.latest_verifications_for_all_consumer_version_tags.all }
+
+        it "returns the same number of rows as the view" do
+          expect(subject.size).to eq Verification.db[:latest_verifications_for_consumer_version_tags].count
+        end
+
+        it "allows eager" do
+          expect(Verification.latest_verifications_for_all_consumer_version_tags.eager(:provider_version).all.first.provider_version.number).to_not be nil
+        end
+      end
+
+      describe "latest_verifications_for_consumer_version_tags" do
+        before do
+          td.create_pact_with_verification_and_tags("Foo", "1", ["fmain"], "Bar", "2")
+            .create_pact_with_verification_and_tags("Foo", "3", ["fmain"], "Bar", "4")
+            .create_pact_with_verification_and_tags("Foo", "5", ["fmain"], "Bar", "5")
+            .create_pact_with_verification_and_tags("Foo", "6", ["other"], "Bar", "5")
+            .create_pact_with_verification_and_tags("Foo2", "6", ["fprod"], "Bar", "7")
+            .create_pact_with_verification_and_tags("Ignored", "6", ["fmain"], "Bar", "8")
+        end
+
+        let(:consumer_ids) { PactBroker::Domain::Pacticipant.where(name: ["Foo", "Foo2"]).all.collect(&:id) }
+
+        subject { Verification.latest_verifications_for_consumer_version_tags(consumer_ids, ["fmain", "fprod"]).order(:id) }
+
+        it "returns the latest verifications for the given consumer ids and consumer version tag names" do
+          expect(subject.first.provider_version_number).to eq "5"
+          expect(subject.first.consumer_name).to eq "Foo"
+          expect(subject.first.consumer_version_tag_name).to eq "fmain"
+          expect(subject.last.provider_version_number).to eq "7"
+          expect(subject.last.consumer_name).to eq "Foo2"
+          expect(subject.last.consumer_version_tag_name).to eq "fprod"
+        end
+
+        it "allows eager" do
+          expect(subject.eager(:provider_version).all.first.provider_version.number).to eq "5"
+        end
+      end
+
       describe "delete" do
         before do
           td.create_pact_with_hierarchy("Foo", "1", "Bar")

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

@@ -9,17 +9,20 @@ module PactBroker
         describe "verificationResultsPerPactVersion" do
           before do
             td.create_pact_with_hierarchy
+              .create_consumer_version_tag("prod")
               .comment("this pact version will have 2 verifications")
               .create_verification
-              .create_verification(number: 2)
+              .create_verification(number: 2, tag_names: ["main"])
               .revise_pact
               .comment("this pact version will have 1 verification")
               .create_verification
               .create_consumer_version
+              .create_consumer_version_tag("main")
               .create_pact
               .comment("this pact will have 1 verification")
               .create_verification
               .create_consumer_version
+              .create_consumer_version_tag("main")
               .create_pact
               .comment("this pact will have 1 verification")
               .create_verification

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

@@ -569,8 +569,7 @@ module PactBroker
 
       describe "find_pact" do
         let!(:pact) do
-          builder = TestDataBuilder.new
-          pact = builder
+          pact = td
             .create_consumer("Consumer")
             .create_consumer_version("1.2.2")
             .create_provider("Provider")
@@ -580,7 +579,7 @@ module PactBroker
             .create_pact
             .revise_pact
             .and_return(:pact)
-          builder
+          td
             .create_consumer_version("1.2.6")
             .create_pact
             .create_provider("Another Provider")
@@ -600,6 +599,14 @@ module PactBroker
           expect(subject.json_content).to_not be_nil
         end
 
+        context "with no version" do
+          subject  { Repository.new.find_pact("Consumer", nil, "Provider") }
+
+          it "returns the latest pact" do
+            expect(subject.consumer_version_number).to eq "1.2.6"
+          end
+        end
+
         context "with a pact_version_sha" do
           subject  { Repository.new.find_pact "Consumer", nil, "Provider", pact.pact_version_sha }
 
@@ -609,26 +616,66 @@ module PactBroker
             expect(subject.provider.name).to eq "Provider"
             expect(subject.consumer_version_number).to eq "1.2.4"
             expect(subject.revision_number).to eq 2
-
           end
+
           context "when there are multiple pact publications for the pact version" do
             before do
               # Double check the data is set up correctly...
               expect(pact_1.pact_version_sha).to eq(pact_2.pact_version_sha)
             end
 
-            let(:td) { TestDataBuilder.new }
             let!(:pact_1) { td.create_pact_with_hierarchy("Foo", "1", "Bar").and_return(:pact) }
             let!(:pact_2) { td.create_consumer_version("2").create_pact(json_content: pact_1.json_content).and_return(:pact) }
 
-            subject  { Repository.new.find_pact "Foo", nil, "Bar", pact_1.pact_version_sha }
+            let(:consumer_version_number) { nil }
+
+            subject  { Repository.new.find_pact "Foo", consumer_version_number, "Bar", pact_1.pact_version_sha }
 
             it "returns the latest pact, ordered by consumer version order" do
               expect(subject.consumer_version_number).to eq "2"
             end
+
+            context "when the consumer_version_number is specified too (from the URL metadata)" do
+              let(:consumer_version_number) { "1" }
+
+              it "returns the publication with the consumer version specified" do
+                expect(subject.consumer_version_number).to eq "1"
+              end
+            end
+
+            context "when the consumer_version_number is specified too (from the URL metadata) but it doesn't exist (anymore)" do
+              let(:consumer_version_number) { "9" }
+
+              it "returns the pact matching the sha with the latest consumer version" do
+                expect(subject.consumer_version_number).to eq "2"
+              end
+            end
+
+            # Not sure when this would happen
+            context "when the consumer_version_number is specified too (from the URL metadata) and it exists but it doesn't match the sha" do
+              before do
+                td.create_pact_with_hierarchy("Foo", "8", "Bar")
+              end
+
+              let(:consumer_version_number) { "8" }
+
+              it "returns the pact matching the sha with the latest consumer version" do
+                expect(subject.consumer_version_number).to eq "2"
+              end
+            end
+
+            context "when the pact has multiple revisions and goes back to a previous revision" do
+              before do
+                td.revise_pact
+                  .revise_pact(pact_1.json_content)
+              end
+
+              it "returns the latest revision" do
+                expect(subject.revision_number).to eq 3
+              end
+            end
           end
         end
-
       end
 
       describe "find_all_revisions" do

data/spec/migrations/change_migration_strategy_spec.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 
-describe "changing from integer to timestamp migrations", no_db_clean: true do
+describe "changing from integer to timestamp migrations", no_db_clean: true, skip: DB.mysql? do
 
   TEST_DIR = "db/test/change_migration_strategy"
   DATABASE_PATH = "#{TEST_DIR}/pact_broker_database.sqlite3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.71.0
+  version: 2.72.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-28 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -558,6 +558,7 @@ files:
 - db/test/backwards_compatibility/spec/support/request_helpers.rb
 - db/test/change_migration_strategy/Rakefile
 - db/test/change_migration_strategy/before/Gemfile
+- docker-compose-ci-mysql.yml
 - docker-compose-dev-postgres.yml
 - docker-compose-issue-repro.yml
 - docker-compose-test.yml
@@ -675,9 +676,11 @@ files:
 - lib/pact_broker/api/resources/matrix.rb
 - lib/pact_broker/api/resources/matrix_badge.rb
 - lib/pact_broker/api/resources/matrix_for_consumer_and_provider.rb
+- lib/pact_broker/api/resources/metadata_resource_methods.rb
 - lib/pact_broker/api/resources/metrics.rb
 - lib/pact_broker/api/resources/pact.rb
 - lib/pact_broker/api/resources/pact_content_diff.rb
+- lib/pact_broker/api/resources/pact_resource_methods.rb
 - lib/pact_broker/api/resources/pact_triggered_webhooks.rb
 - lib/pact_broker/api/resources/pact_version.rb
 - lib/pact_broker/api/resources/pact_versions.rb
@@ -1020,7 +1023,10 @@ files:
 - public/stylesheets/matrix.css
 - public/stylesheets/pact.css
 - script/db-spec.sh
+- script/docker-container/test.sh
 - script/docker/db-execute-sql-file.sh
+- script/docker/db-psql.sh
+- script/docker/db-reload.sh
 - script/docker/db-restore.sh
 - script/docker/db-rm.sh
 - script/docker/db-start.sh
@@ -1036,6 +1042,7 @@ files:
 - script/prod/clean-up.sql
 - script/prod/migrate-latest-pacts.sh
 - script/prod/redact-data.sql
+- script/pry.rb
 - script/publish-2.sh
 - script/publish-new.sh
 - script/publish-not-a-pact.sh
@@ -1055,6 +1062,7 @@ files:
 - script/seed-for-webhook-test.rb
 - script/seed-matrix.rb
 - script/seed.rb
+- script/test/run-rake-on-docker-compose-mysql.sh
 - script/trigger-release.sh
 - script/update-hal-browser
 - script/watch.sh
@@ -1119,6 +1127,7 @@ files:
 - spec/fixtures/a_consumer-a_provider-conflict.json
 - spec/fixtures/a_consumer-a_provider-merged.json
 - spec/fixtures/a_consumer-a_provider.json
+- spec/fixtures/approvals/clean_incremental_dry_run.approved.json
 - spec/fixtures/approvals/modifiable_resources.approved.json
 - spec/fixtures/certificate-invalid.pem
 - spec/fixtures/certificate.pem
@@ -1516,6 +1525,7 @@ test_files:
 - spec/fixtures/a_consumer-a_provider-conflict.json
 - spec/fixtures/a_consumer-a_provider-merged.json
 - spec/fixtures/a_consumer-a_provider.json
+- spec/fixtures/approvals/clean_incremental_dry_run.approved.json
 - spec/fixtures/approvals/modifiable_resources.approved.json
 - spec/fixtures/certificate-invalid.pem
 - spec/fixtures/certificate.pem