pact_broker 2.80.0 → 2.81.0

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

@@ -10,7 +10,7 @@ module PactBroker
         let(:options) { { include_wip_pacts_since: include_wip_pacts_since } }
         let(:include_wip_pacts_since) { (Date.today - 1).to_datetime }
 
-        subject { Repository.new.find_wip_pact_versions_for_provider("bar", provider_version_branch, provider_tags, options) }
+        subject { Repository.new.find_wip_pact_versions_for_provider("bar", provider_version_branch, provider_tags, [], options) }
 
         context "when there are no tags or branch" do
           let(:provider_tags) { [] }

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

@@ -9,7 +9,7 @@ module PactBroker
         let(:options) { { include_wip_pacts_since: include_wip_pacts_since } }
         let(:include_wip_pacts_since) { (Date.today - 1).to_datetime }
 
-        subject { Repository.new.find_wip_pact_versions_for_provider("bar", provider_version_branch, provider_tags, options) }
+        subject { Repository.new.find_wip_pact_versions_for_provider("bar", provider_version_branch, provider_tags, [], options) }
 
         context "when there are no tags" do
           let(:provider_tags) { [] }

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

@@ -17,7 +17,7 @@ module PactBroker
         let(:provider) { Pacticipants::Repository.new.create name: "Provider" }
         let(:version) { PactBroker::Versions::Repository.new.create number: "1.2.3", pacticipant_id: consumer.id }
         let(:pact_version_sha) { "123" }
-        let(:json_content) { {some: "json"}.to_json }
+        let(:json_content) { { interactions: ["json"] }.to_json }
 
         let(:params) do
           {
@@ -25,7 +25,8 @@ module PactBroker
             consumer_id: consumer.id,
             provider_id: provider.id,
             json_content: json_content,
-            pact_version_sha: pact_version_sha
+            pact_version_sha: pact_version_sha,
+            version: version
           }
         end
 
@@ -62,6 +63,16 @@ module PactBroker
           expect(LatestPactPublicationIdForConsumerVersion.first.created_at).to eq PactBroker::Domain::Version.find(number: subject.consumer_version_number).created_at
         end
 
+        it "sets the interactions count" do
+          subject
+          expect(PactVersion.order(:id).last.interactions_count).to eq 1
+        end
+
+        it "sets the messages count" do
+          subject
+          expect(PactVersion.order(:id).last.messages_count).to eq 0
+        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 }
 
@@ -71,7 +82,8 @@ module PactBroker
               consumer_id: consumer.id,
               provider_id: provider.id,
               json_content: json_content,
-              pact_version_sha: pact_version_sha
+              pact_version_sha: pact_version_sha,
+              version: version
             )
           end
 
@@ -81,7 +93,8 @@ module PactBroker
               consumer_id: consumer.id,
               provider_id: provider.id,
               json_content: json_content,
-              pact_version_sha: pact_version_sha
+              pact_version_sha: pact_version_sha,
+              version: another_version
             )
           end
 
@@ -123,7 +136,8 @@ module PactBroker
               consumer_id: consumer.id,
               provider_id: provider.id,
               json_content: json_content,
-              pact_version_sha: sha_1
+              pact_version_sha: sha_1,
+              version: version
             )
           end
 
@@ -133,7 +147,8 @@ module PactBroker
               consumer_id: consumer.id,
               provider_id: provider.id,
               json_content: json_content,
-              pact_version_sha: sha_2
+              pact_version_sha: sha_2,
+              version: another_version
             )
           end
 
@@ -161,7 +176,8 @@ module PactBroker
               consumer_id: consumer.id,
               provider_id: another_provider.id,
               json_content: json_content,
-              pact_version_sha: pact_version_sha
+              pact_version_sha: pact_version_sha,
+              version: version
             )
           end
 
@@ -171,7 +187,8 @@ module PactBroker
               consumer_id: consumer.id,
               provider_id: provider.id,
               json_content: json_content,
-              pact_version_sha: pact_version_sha
+              pact_version_sha: pact_version_sha,
+              version: another_version
             )
           end
 
@@ -189,7 +206,8 @@ module PactBroker
               consumer_id: consumer.id,
               provider_id: provider.id,
               json_content: {some_other: "json_content"}.to_json,
-              pact_version_sha: pact_version_sha
+              pact_version_sha: pact_version_sha,
+              version: version
             )
           end
 
@@ -199,7 +217,8 @@ module PactBroker
               consumer_id: consumer.id,
               provider_id: provider.id,
               json_content: json_content,
-              pact_version_sha: "#{pact_version_sha}111"
+              pact_version_sha: "#{pact_version_sha}111",
+              version: another_version
             )
           end
 
@@ -312,8 +331,7 @@ module PactBroker
 
       describe "delete" do
         before do
-          TestDataBuilder.new
-            .create_consumer(consumer_name)
+          td.create_consumer(consumer_name)
             .create_consumer_version("1.2.3")
             .create_provider(provider_name)
             .create_pact
@@ -341,8 +359,7 @@ module PactBroker
 
       describe "delete_by_version_id" do
         let!(:version) do
-          TestDataBuilder.new
-            .create_consumer
+          td.create_consumer
             .create_provider
             .create_consumer_version("4.5.6")
             .create_pact
@@ -365,8 +382,7 @@ module PactBroker
       describe "#find_all_pact_versions_between" do
 
         before do
-          TestDataBuilder.new
-            .create_consumer(consumer_name)
+          td.create_consumer(consumer_name)
             .create_consumer_version("1.2.3")
             .create_provider(provider_name)
             .create_pact
@@ -401,8 +417,7 @@ module PactBroker
       describe "#delete_all_pact_publications_between" do
 
         before do
-          TestDataBuilder.new
-            .create_consumer(consumer_name)
+          td.create_consumer(consumer_name)
             .create_consumer_version("1.2.3")
             .create_provider(provider_name)
             .create_pact
@@ -435,11 +450,10 @@ module PactBroker
         end
       end
 
-      describe "#find_latest_pact_versions_for_provider" do
+      describe "#find_latest_pacts_for_provider" do
         context "with no tag specified" do
           before do
-            TestDataBuilder.new
-              .create_consumer(consumer_name)
+            td.create_consumer(consumer_name)
               .create_consumer_version("1.0.0")
               .create_provider(provider_name)
               .create_pact
@@ -454,22 +468,23 @@ module PactBroker
               .create_pact
           end
 
-          subject { Repository.new.find_latest_pact_versions_for_provider provider_name }
+          subject { Repository.new.find_latest_pacts_for_provider provider_name }
 
           it "returns the pacts between the specified consumer and provider" do
             expect(subject.size).to eq 2
             expect(subject.first.consumer.name).to eq consumer_name
             expect(subject.first.provider.name).to eq provider_name
             expect(subject.first.consumer_version.number).to eq "1.2.3"
-            expect(subject.first.json_content).to be nil
+            expect(subject.first.json_content).to_not be nil
             expect(subject.last.consumer.name).to eq "wiffle consumer"
+            expect(subject.last.tag).to eq nil
+            expect(subject.last.overall_latest?).to be true
           end
         end
 
         context "with a tag specified" do
           before do
-            TestDataBuilder.new
-              .create_consumer(consumer_name)
+            td.create_consumer(consumer_name)
               .create_consumer_version("1.2.3")
               .create_consumer_version_tag("prod")
               .create_provider(provider_name)
@@ -487,16 +502,19 @@ module PactBroker
               .create_pact
           end
 
-          subject { Repository.new.find_latest_pact_versions_for_provider provider_name, "prod" }
+          subject { Repository.new.find_latest_pacts_for_provider provider_name, "prod" }
 
-          it "returns the pacts between the specified consumer and provider with the given tag" do
+          it "returns the pacts between the specified consumer and provider with the given consumer version tag" do
             expect(subject.size).to eq 2
             expect(subject.first.provider.name).to eq provider_name
             expect(subject.first.consumer.name).to eq consumer_name
             expect(subject.first.consumer_version.number).to eq "1.2.3"
-            expect(subject.first.json_content).to be nil
+            expect(subject.first.json_content).to_not be nil
+            expect(subject.first.tag).to eq "prod"
             expect(subject.last.consumer.name).to eq "wiffle consumer"
             expect(subject.last.consumer_version.number).to eq "5.0.0"
+            expect(subject.last.tag).to eq "prod"
+            expect(subject.last.overall_latest?).to be false
           end
         end
       end
@@ -504,8 +522,7 @@ module PactBroker
       describe "#find_pact_versions_for_provider" do
         context "with no tag specified" do
           before do
-            TestDataBuilder.new
-              .create_consumer(consumer_name)
+            td.create_consumer(consumer_name)
               .create_consumer_version("1.0.0")
               .create_provider(provider_name)
               .create_pact
@@ -530,8 +547,7 @@ module PactBroker
 
         context "with a tag specified" do
           before do
-            TestDataBuilder.new
-              .create_consumer(consumer_name)
+            td.create_consumer(consumer_name)
               .create_consumer_version("1")
               .create_consumer_version_tag("prod")
               .create_provider(provider_name)
@@ -554,13 +570,13 @@ module PactBroker
 
           subject { Repository.new.find_pact_versions_for_provider provider_name, "prod" }
 
-          it "returns the pacts between the specified consumer and provider with the given tag" do
+          it "returns the pacts between the specified provider with the given consumer tag" do
             expect(subject.size).to eq 3
             expect(subject.first.provider.name).to eq provider_name
             expect(subject.first.consumer.name).to eq consumer_name
             expect(subject.first.consumer_version.number).to eq "1"
             expect(subject[1].consumer_version.number).to eq "2"
-            expect(subject.first.json_content).to be nil
+            expect(subject.first.json_content).to_not be nil
             expect(subject.last.consumer.name).to eq "wiffle consumer"
             expect(subject.last.consumer_version.number).to eq "11"
           end
@@ -680,8 +696,7 @@ module PactBroker
 
       describe "find_all_revisions" do
         before do
-          TestDataBuilder.new
-            .create_pact_with_hierarchy("foo", "3.0.0", "bar")
+          td.create_pact_with_hierarchy("foo", "3.0.0", "bar")
             .revise_pact
             .create_pact_with_hierarchy(consumer_name, "1.2.3", provider_name)
             .revise_pact
@@ -701,8 +716,7 @@ module PactBroker
 
       describe "find_previous_pact" do
         before do
-          TestDataBuilder.new
-            .create_consumer("Consumer")
+          td.create_consumer("Consumer")
             .create_consumer_version("1.2.2")
             .create_provider("Provider")
             .create_consumer_version_tag("a_tag")
@@ -778,8 +792,7 @@ module PactBroker
 
       describe "find_next_pact" do
         before do
-          TestDataBuilder.new
-            .create_consumer("Consumer")
+          td.create_consumer("Consumer")
             .create_consumer_version("1.2.2")
             .create_provider("Provider")
             .create_pact
@@ -823,8 +836,7 @@ module PactBroker
         end
 
         before do
-          TestDataBuilder.new
-            .create_consumer("Consumer")
+          td.create_consumer("Consumer")
             .create_provider("Provider")
             .create_consumer_version("1")
             .create_pact(json_content: pact_content_version_1)
@@ -864,8 +876,7 @@ module PactBroker
         context "with a tag" do
           context "when a version with a pact exists with the given tag" do
             before do
-              TestDataBuilder.new
-                .create_consumer("Consumer")
+              td.create_consumer("Consumer")
                 .create_consumer_version("2.3.4")
                 .create_provider("Provider")
                 .create_pact
@@ -894,8 +905,7 @@ module PactBroker
         context "without a tag" do
           context "when one or more versions of a pact exist without any tags" do
             before do
-              TestDataBuilder.new
-                .create_consumer("Consumer")
+              td.create_consumer("Consumer")
                 .create_provider("Provider")
                 .create_consumer_version("1.0.0")
                 .create_pact
@@ -923,8 +933,7 @@ module PactBroker
 
           context "when all versions have a tag" do
             before do
-              TestDataBuilder.new
-                .create_consumer("Consumer")
+              td.create_consumer("Consumer")
                 .create_provider("Provider")
                 .create_consumer_version("2.3.4")
                 .create_consumer_version_tag("prod")
@@ -943,8 +952,7 @@ module PactBroker
       describe "search_for_latest_pact" do
         context "when one or more versions of a pact exist without any tags" do
           before do
-            TestDataBuilder.new
-              .create_consumer("Consumer")
+            td.create_consumer("Consumer")
               .create_provider("Provider")
               .create_consumer_version("1")
               .create_pact
@@ -981,8 +989,7 @@ module PactBroker
 
       describe "find_latest_pacts" do
         before do
-          TestDataBuilder.new
-            .create_consumer("Condor")
+          td.create_consumer("Condor")
             .create_consumer_version("1.3.0")
             .create_provider("Pricing Service")
             .create_pact

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

@@ -14,6 +14,7 @@ module PactBroker
       let(:pact_version_url) { "http://pact" }
       let(:verifiable_pact) do
         double(VerifiablePact,
+            consumer: double("consumer", main_branch: "main"),
             consumer_name: "Foo",
             consumer_version_number: "123",
             provider_name: "Bar",
@@ -84,6 +85,14 @@ module PactBroker
           its(:inclusion_reason) { is_expected.to include "latest version from branch 'master' (fallback branch used as no pact was found from branch 'feat-x') (1234)" }
         end
 
+        context "when the pact was for the main branch" do
+          let(:selectors) { Selectors.new(Selector.for_main_branch.resolve(consumer_version)) }
+
+          context "when the main branch is called main" do
+            its(:inclusion_reason) { is_expected.to include "latest version from the main branch 'main' (1234)" }
+          end
+        end
+
         context "when the pact is a WIP pact for the specified provider tags" do
           let(:selectors) { Selectors.create_for_latest_of_each_tag(%w[feat-x]).resolve(consumer_version) }
           let(:wip) { true }

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

@@ -0,0 +1,18 @@
+require "pact_broker/verifications/latest_verification_for_pact_version"
+
+module PactBroker
+  module Verifications
+    describe LatestVerificationForPactVersion do
+      before do
+        td.create_pact_with_hierarchy("Foo", "1", "Bar")
+          .create_verification(provider_version: "2")
+      end
+
+      subject { LatestVerificationForPactVersion.first }
+
+      its(:"consumer.name") { is_expected.to eq "Foo" }
+      its(:"provider.name") { is_expected.to eq "Bar" }
+      its(:"provider_version.number") { is_expected.to eq "2" }
+    end
+  end
+end

data/spec/support/shared_context.rb

@@ -1,7 +1,6 @@
 require "pact_broker/test/test_data_builder"
 
 RSpec.shared_context "stubbed services" do
-
   let(:pact_service) { class_double("PactBroker::Pacts::Service").as_stubbed_const }
   let(:pacticipant_service) { class_double("PactBroker::Pacticipants::Service").as_stubbed_const }
   let(:version_service) { class_double("PactBroker::Versions::Service").as_stubbed_const }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.80.0
+  version: 2.81.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -420,6 +420,7 @@ files:
 - 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/ddl_statements/latest_verifications_for_pact_versions.rb
 - db/migrations/000001_create_pacticipant_table.rb
 - db/migrations/000002_create_versions_table.rb
 - db/migrations/000003_create_pacts_table.rb
@@ -558,6 +559,8 @@ files:
 - db/migrations/20210608_add_uuid_to_webhook.rb
 - db/migrations/20210609_set_webhook_uuid.rb
 - db/migrations/20210702_drop_unused_columns_from_deployed_versions.rb
+- db/migrations/20210711_add_consumer_version_order_to_pact_publication.rb
+- db/migrations/20210712_add_interaction_count_to_pact_versions.rb
 - db/migrations/migration_helper.rb
 - db/test/backwards_compatibility/.rspec
 - db/test/backwards_compatibility/Appraisals
@@ -746,6 +749,7 @@ files:
 - lib/pact_broker/api/resources/pacticipant_webhooks.rb
 - lib/pact_broker/api/resources/pacticipants.rb
 - lib/pact_broker/api/resources/pacticipants_for_label.rb
+- lib/pact_broker/api/resources/pagination_methods.rb
 - lib/pact_broker/api/resources/previous_distinct_pact_version.rb
 - lib/pact_broker/api/resources/provider_pacts.rb
 - lib/pact_broker/api/resources/provider_pacts_for_verification.rb
@@ -793,9 +797,11 @@ 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_consumer_version_order_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_extra_columns_for_tags.rb
+- lib/pact_broker/db/data_migrations/set_interactions_counts.rb
 - lib/pact_broker/db/data_migrations/set_latest_version_sequence_value.rb
 - lib/pact_broker/db/data_migrations/set_pacticipant_display_name.rb
 - lib/pact_broker/db/data_migrations/set_pacticipant_ids_for_verifications.rb
@@ -963,6 +969,7 @@ files:
 - lib/pact_broker/relationships/groupify.rb
 - lib/pact_broker/repositories.rb
 - lib/pact_broker/repositories/helpers.rb
+- lib/pact_broker/repositories/scopes.rb
 - lib/pact_broker/services.rb
 - lib/pact_broker/string_refinements.rb
 - lib/pact_broker/tags/eager_loaders.rb
@@ -1269,6 +1276,7 @@ files:
 - spec/features/get_versions_spec.rb
 - spec/features/label_pacticipant_spec.rb
 - spec/features/merge_pact_spec.rb
+- spec/features/metadata_spec.rb
 - spec/features/metrics_spec.rb
 - spec/features/pending_pacts_spec.rb
 - spec/features/pending_pacts_with_tags_spec.rb
@@ -1276,6 +1284,7 @@ files:
 - spec/features/publish_pact_all_in_one_approval_spec.rb
 - spec/features/publish_pact_all_in_one_spec.rb
 - spec/features/publish_pact_spec.rb
+- spec/features/publish_verification_results_and_version_spec.rb
 - spec/features/publish_verification_spec.rb
 - spec/features/record_deployment_spec.rb
 - spec/features/record_release_spec.rb
@@ -1422,11 +1431,13 @@ files:
 - spec/lib/pact_broker/db/clean_spec.rb
 - spec/lib/pact_broker/db/data_migrations/migrate_webhook_headers_spec.rb
 - spec/lib/pact_broker/db/data_migrations/set_consumer_ids_for_pact_publications_spec.rb
+- spec/lib/pact_broker/db/data_migrations/set_interactions_counts_spec.rb
 - spec/lib/pact_broker/db/data_migrations/set_latest_version_sequence_value_spec.rb
 - spec/lib/pact_broker/db/data_migrations/set_pacticipant_main_branch_spec.rb
 - spec/lib/pact_broker/db/delete_overwritten_data_spec.rb
 - spec/lib/pact_broker/db/log_quietener_spec.rb
 - spec/lib/pact_broker/db/validate_encoding_spec.rb
+- spec/lib/pact_broker/deployments/deployed_version_service_spec.rb
 - spec/lib/pact_broker/deployments/deployed_version_spec.rb
 - spec/lib/pact_broker/deployments/environment_service_spec.rb
 - spec/lib/pact_broker/deployments/environment_spec.rb
@@ -1516,6 +1527,7 @@ files:
 - spec/lib/pact_broker/ui/view_models/index_items_spec.rb
 - spec/lib/pact_broker/ui/view_models/matrix_deployed_version_spec.rb
 - spec/lib/pact_broker/ui/view_models/matrix_line_spec.rb
+- spec/lib/pact_broker/verifications/latest_verification_for_pact_version_spec.rb
 - spec/lib/pact_broker/verifications/pseudo_branch_status_spec.rb
 - spec/lib/pact_broker/verifications/repository_spec.rb
 - spec/lib/pact_broker/verifications/sequence_spec.rb
@@ -1665,7 +1677,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.2.24
 signing_key: 
 specification_version: 4
 summary: See description
@@ -1728,6 +1740,7 @@ test_files:
 - spec/features/get_versions_spec.rb
 - spec/features/label_pacticipant_spec.rb
 - spec/features/merge_pact_spec.rb
+- spec/features/metadata_spec.rb
 - spec/features/metrics_spec.rb
 - spec/features/pending_pacts_spec.rb
 - spec/features/pending_pacts_with_tags_spec.rb
@@ -1735,6 +1748,7 @@ test_files:
 - spec/features/publish_pact_all_in_one_approval_spec.rb
 - spec/features/publish_pact_all_in_one_spec.rb
 - spec/features/publish_pact_spec.rb
+- spec/features/publish_verification_results_and_version_spec.rb
 - spec/features/publish_verification_spec.rb
 - spec/features/record_deployment_spec.rb
 - spec/features/record_release_spec.rb
@@ -1881,11 +1895,13 @@ test_files:
 - spec/lib/pact_broker/db/clean_spec.rb
 - spec/lib/pact_broker/db/data_migrations/migrate_webhook_headers_spec.rb
 - spec/lib/pact_broker/db/data_migrations/set_consumer_ids_for_pact_publications_spec.rb
+- spec/lib/pact_broker/db/data_migrations/set_interactions_counts_spec.rb
 - spec/lib/pact_broker/db/data_migrations/set_latest_version_sequence_value_spec.rb
 - spec/lib/pact_broker/db/data_migrations/set_pacticipant_main_branch_spec.rb
 - spec/lib/pact_broker/db/delete_overwritten_data_spec.rb
 - spec/lib/pact_broker/db/log_quietener_spec.rb
 - spec/lib/pact_broker/db/validate_encoding_spec.rb
+- spec/lib/pact_broker/deployments/deployed_version_service_spec.rb
 - spec/lib/pact_broker/deployments/deployed_version_spec.rb
 - spec/lib/pact_broker/deployments/environment_service_spec.rb
 - spec/lib/pact_broker/deployments/environment_spec.rb
@@ -1975,6 +1991,7 @@ test_files:
 - spec/lib/pact_broker/ui/view_models/index_items_spec.rb
 - spec/lib/pact_broker/ui/view_models/matrix_deployed_version_spec.rb
 - spec/lib/pact_broker/ui/view_models/matrix_line_spec.rb
+- spec/lib/pact_broker/verifications/latest_verification_for_pact_version_spec.rb
 - spec/lib/pact_broker/verifications/pseudo_branch_status_spec.rb
 - spec/lib/pact_broker/verifications/repository_spec.rb
 - spec/lib/pact_broker/verifications/sequence_spec.rb