pact_broker 2.83.0 → 2.84.0

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

@@ -37,7 +37,7 @@ module PactBroker
 
             it "does not update the branch" do
               subject
-              expect(td.find_version(pacticipant_name, version_number).branch).to eq "foo"
+              expect(td.find_version(pacticipant_name, version_number).branch_names).to eq ["foo"]
             end
           end
 
@@ -77,7 +77,8 @@ module PactBroker
 
           context "when the version was created within the limit" do
             before do
-              version = td.create_consumer(pacticipant_name)
+              version = td
+                .create_consumer(pacticipant_name)
                 .create_consumer_version(version_number)
                 .and_return(:consumer_version)
 
@@ -91,7 +92,7 @@ module PactBroker
 
             it "sets the branch" do
               subject
-              expect(td.find_version(pacticipant_name, version_number).branch).to eq "prod"
+              expect(td.find_version(pacticipant_name, version_number).branch_names).to include "prod"
             end
           end
         end

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

@@ -124,6 +124,12 @@ module PactBroker
           ["${pactbroker.azureDevOpsVerificationStatus}", "pending", :pact_with_no_verification, :nil_verification],
           ["${pactbroker.azureDevOpsVerificationStatus}", "succeeded", :pact_with_successful_verification, :nil_verification],
           ["${pactbroker.azureDevOpsVerificationStatus}", "failed", :pact_with_failed_verification, :nil_verification],
+          ["${pactbroker.gitlabVerificationStatus}", "success", :pact, :verification],
+          ["${pactbroker.gitlabVerificationStatus}", "failed", :pact, :failed_verification],
+          ["${pactbroker.gitlabVerificationStatus}", "pending", :nil_pact, :nil_verification],
+          ["${pactbroker.gitlabVerificationStatus}", "pending", :pact_with_no_verification, :nil_verification],
+          ["${pactbroker.gitlabVerificationStatus}", "success", :pact_with_successful_verification, :nil_verification],
+          ["${pactbroker.gitlabVerificationStatus}", "failed", :pact_with_failed_verification, :nil_verification],
           ["${pactbroker.verificationResultUrl}", "", :pact_with_no_verification, :nil_verification],
           ["${pactbroker.verificationResultUrl}", "http://verification", :pact_with_successful_verification, :nil_verification],
           ["${pactbroker.verificationResultUrl}", "http://verification", :pact_with_successful_verification, :verification],

data/spec/lib/sequel/plugins/upsert_spec.rb

@@ -112,7 +112,6 @@ module Sequel
           version = Version.new(
             number: "1",
             pacticipant_id: pacticipant.id,
-            branch: "original-branch",
             build_url: "original-url"
           ).upsert
           Version.where(id: version.id).update(created_at: yesterday, updated_at: yesterday)
@@ -121,7 +120,7 @@ module Sequel
         let(:yesterday) { DateTime.now - 2 }
 
         subject do
-          Version.new(number: "1", pacticipant_id: pacticipant.id, branch: "new-branch").upsert
+          Version.new(number: "1", pacticipant_id: pacticipant.id, build_url: "new-url").upsert
         end
 
         it "does not raise an error" do
@@ -129,13 +128,20 @@ module Sequel
         end
 
         it "sets the values on the object" do
-          expect(subject.branch).to eq "new-branch"
+          expect(subject.build_url).to eq "new-url"
         end
 
-        it "nils out values that weren't set on the second model" do
-          expect(subject.build_url).to eq nil
+        context "when an attribute is not set" do
+          subject do
+            Version.new(number: "1", pacticipant_id: pacticipant.id).upsert
+          end
+
+          it "nils out values that weren't set on the second model" do
+            expect(subject.build_url).to eq nil
+          end
         end
 
+
         it "does not insert another row" do
           expect { subject }.to_not change { Version.count }
         end

data/spec/migrations/44_add_provider_version_to_verification_spec.rb

@@ -31,29 +31,26 @@ describe "add provider version relationship to verification (migrate 42-44)", mi
   subject { PactBroker::Database.migrate(46) }
 
   it "creates a version object" do
-    expect { subject }.to change { PactBroker::Domain::Version.count }.by(1)
+    expect { subject }.to change { database[:versions].count }.by(1)
   end
 
   it "sets the foreign key to the new version" do
     subject
-    expect(PactBroker::Domain::Verification.first.provider_version.number).to eq "1.2.3"
-  end
-
-  it "sets the created_at date of the new version to the created_at of the verification" do
-    subject
-    expect(PactBroker::Domain::Verification.first.provider_version.created_at.to_datetime).to eq now
+    provider_version_id = database[:verifications].order(:id).first[:provider_version_id]
+    expect(database[:versions].where(id: provider_version_id).single_record[:number]).to eq "1.2.3"
   end
 
   context "when the version already exists" do
     let!(:provider_version) { create(:versions, {number: "1.2.3", order: 1, pacticipant_id: provider[:id], created_at: now, updated_at: now}) }
 
     it "does not create a version object" do
-      expect { subject }.to_not change { PactBroker::Domain::Version.count }
+      expect { subject }.to_not change { database[:versions].count }
     end
 
     it "sets the foreign key to the existing version" do
       subject
-      expect(PactBroker::Domain::Verification.first.provider_version.number).to eq "1.2.3"
+      provider_version_id = database[:verifications].order(:id).first[:provider_version_id]
+      expect(database[:versions].where(id: provider_version_id).single_record[:number]).to eq "1.2.3"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.83.0
+  version: 2.84.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -578,7 +578,10 @@ files:
 - db/migrations/20210722_add_index_to_triggered_webhooks_webhook_uuid.rb
 - db/migrations/20210810_set_allow_contract_modification.rb
 - db/migrations/20210815_add_provider_version_id_index_to_verifications.rb
+- db/migrations/20210816_create_branches_tables.rb
 - db/migrations/20210818_add_consumer_version_selectors_to_verification.rb
+- db/migrations/20210831_add_index_to_pact_publications.rb
+- db/migrations/20210908_add_auto_created.rb
 - db/migrations/migration_helper.rb
 - db/test/backwards_compatibility/.rspec
 - db/test/backwards_compatibility/Appraisals
@@ -646,16 +649,17 @@ files:
 - lib/pact_broker/api/contracts/pacticipant_name_contract.rb
 - lib/pact_broker/api/contracts/pacticipant_name_validation.rb
 - lib/pact_broker/api/contracts/pacticipant_schema.rb
+- lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema.rb
+- lib/pact_broker/api/contracts/pacts_for_verification_query_string_schema.rb
 - lib/pact_broker/api/contracts/publish_contracts_schema.rb
 - lib/pact_broker/api/contracts/put_pact_params_contract.rb
 - lib/pact_broker/api/contracts/request_validations.rb
-- lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema.rb
-- lib/pact_broker/api/contracts/verifiable_pacts_query_schema.rb
 - lib/pact_broker/api/contracts/verification_contract.rb
 - lib/pact_broker/api/contracts/webhook_contract.rb
 - lib/pact_broker/api/decorators.rb
 - lib/pact_broker/api/decorators/base_decorator.rb
 - lib/pact_broker/api/decorators/basic_pacticipant_decorator.rb
+- lib/pact_broker/api/decorators/branch_version_decorator.rb
 - lib/pact_broker/api/decorators/configuration.rb
 - lib/pact_broker/api/decorators/dashboard_decorator.rb
 - lib/pact_broker/api/decorators/dashboard_text_decorator.rb
@@ -663,6 +667,7 @@ files:
 - lib/pact_broker/api/decorators/decorator_context_creator.rb
 - lib/pact_broker/api/decorators/deployed_version_decorator.rb
 - lib/pact_broker/api/decorators/deployed_versions_decorator.rb
+- lib/pact_broker/api/decorators/embedded_branch_version_decorator.rb
 - lib/pact_broker/api/decorators/embedded_label_decorator.rb
 - lib/pact_broker/api/decorators/embedded_pacticipant_decorator.rb
 - lib/pact_broker/api/decorators/embedded_tag_decorator.rb
@@ -687,6 +692,7 @@ files:
 - lib/pact_broker/api/decorators/pact_webhooks_status_decorator.rb
 - lib/pact_broker/api/decorators/pacticipant_collection_decorator.rb
 - lib/pact_broker/api/decorators/pacticipant_decorator.rb
+- lib/pact_broker/api/decorators/pacts_for_verification_query_decorator.rb
 - lib/pact_broker/api/decorators/pagination_links.rb
 - lib/pact_broker/api/decorators/provider_pacts_decorator.rb
 - lib/pact_broker/api/decorators/publish_contract_decorator.rb
@@ -704,7 +710,6 @@ files:
 - lib/pact_broker/api/decorators/triggered_webhooks_decorator.rb
 - lib/pact_broker/api/decorators/verifiable_pact_decorator.rb
 - lib/pact_broker/api/decorators/verifiable_pacts_decorator.rb
-- lib/pact_broker/api/decorators/verifiable_pacts_query_decorator.rb
 - lib/pact_broker/api/decorators/verification_decorator.rb
 - lib/pact_broker/api/decorators/verification_summary_decorator.rb
 - lib/pact_broker/api/decorators/version_decorator.rb
@@ -724,6 +729,7 @@ files:
 - lib/pact_broker/api/resources/authorization.rb
 - lib/pact_broker/api/resources/badge.rb
 - lib/pact_broker/api/resources/base_resource.rb
+- lib/pact_broker/api/resources/branch_version.rb
 - lib/pact_broker/api/resources/can_i_deploy.rb
 - lib/pact_broker/api/resources/can_i_deploy_badge.rb
 - lib/pact_broker/api/resources/can_i_deploy_pacticipant_version.rb
@@ -819,6 +825,7 @@ files:
 - lib/pact_broker/db/clean.rb
 - lib/pact_broker/db/clean/selector.rb
 - lib/pact_broker/db/clean_incremental.rb
+- lib/pact_broker/db/data_migrations/create_branches.rb
 - lib/pact_broker/db/data_migrations/delete_deprecated_webhook_executions.rb
 - lib/pact_broker/db/data_migrations/helpers.rb
 - lib/pact_broker/db/data_migrations/migrate_webhook_headers.rb
@@ -868,6 +875,7 @@ files:
 - lib/pact_broker/doc/views/index/latest-provider-pacts.markdown
 - lib/pact_broker/doc/views/index/latest-tagged-version.markdown
 - lib/pact_broker/doc/views/index/latest-version.markdown
+- lib/pact_broker/doc/views/index/pacticipant-branch-version.markdown
 - lib/pact_broker/doc/views/index/pacticipant-version-tag.markdown
 - lib/pact_broker/doc/views/index/pacticipant-version.markdown
 - lib/pact_broker/doc/views/index/pacticipants.markdown
@@ -1027,6 +1035,7 @@ files:
 - lib/pact_broker/ui/view_models/clusters.rb
 - lib/pact_broker/ui/view_models/index_item.rb
 - lib/pact_broker/ui/view_models/index_items.rb
+- lib/pact_broker/ui/view_models/matrix_branch.rb
 - lib/pact_broker/ui/view_models/matrix_deployed_version.rb
 - lib/pact_broker/ui/view_models/matrix_line.rb
 - lib/pact_broker/ui/view_models/matrix_lines.rb
@@ -1055,9 +1064,13 @@ files:
 - lib/pact_broker/verifications/summary_for_consumer_version.rb
 - lib/pact_broker/version.rb
 - lib/pact_broker/versions/abbreviate_number.rb
+- lib/pact_broker/versions/branch.rb
+- lib/pact_broker/versions/branch_head.rb
+- lib/pact_broker/versions/branch_service.rb
+- lib/pact_broker/versions/branch_version.rb
+- lib/pact_broker/versions/branch_version_repository.rb
 - lib/pact_broker/versions/eager_loaders.rb
 - lib/pact_broker/versions/latest_version.rb
-- lib/pact_broker/versions/lazy_loaders.rb
 - lib/pact_broker/versions/parse_semantic_version.rb
 - lib/pact_broker/versions/repository.rb
 - lib/pact_broker/versions/sequence.rb
@@ -1194,9 +1207,11 @@ files:
 - scaffolding/templates/service.rb.erb
 - scaffolding/templates/service_spec.rb.erb
 - script/data/auto-create-things-for-tags.rb
+- script/data/branches.rb
 - script/data/contract-published-requiring-verification.rb
 - script/data/environments.rb
 - script/data/expand-currently-deployed.rb
+- script/data/issue-494.rb
 - script/db-spec.sh
 - script/demonstrate-version-branches.rb
 - script/dev/rubocop-modified-files.sh
@@ -1252,6 +1267,7 @@ files:
 - script/webhook-server.ru
 - spec/features/base_equality_only_on_content_that_affects_verification_results_spec.rb
 - spec/features/can_i_deploy_spec.rb
+- spec/features/create_branch_version_spec.rb
 - spec/features/create_environment_spec.rb
 - spec/features/create_pacticipant_spec.rb
 - spec/features/create_tag_spec.rb
@@ -1271,6 +1287,7 @@ files:
 - spec/features/end_support_spec.rb
 - spec/features/execute_unsaved_webhook_spec.rb
 - spec/features/execute_webhook_spec.rb
+- spec/features/get_branch_version_spec.rb
 - spec/features/get_can_i_deploy_badge_spec.rb
 - spec/features/get_currently_deployed_versions_for_environment_spec.rb
 - spec/features/get_currently_deployed_versions_for_version_spec.rb
@@ -1372,11 +1389,11 @@ files:
 - spec/lib/pact/doc/markdown/index_renderer_spec.rb
 - spec/lib/pact_broker/api/contracts/environment_schema_spec.rb
 - spec/lib/pact_broker/api/contracts/pacticipant_schema_spec.rb
+- spec/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema_combinations_spec.rb
+- spec/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema_spec.rb
+- spec/lib/pact_broker/api/contracts/pacts_for_verification_query_string_schema_spec.rb
 - spec/lib/pact_broker/api/contracts/publish_contracts_schema_spec.rb
 - spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb
-- spec/lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema_combinations_spec.rb
-- spec/lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema_spec.rb
-- spec/lib/pact_broker/api/contracts/verifiable_pacts_query_schema_spec.rb
 - spec/lib/pact_broker/api/contracts/verification_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/webhook_contract_spec.rb
 - spec/lib/pact_broker/api/decorators/dashboard_decorator_spec.rb
@@ -1395,6 +1412,7 @@ files:
 - spec/lib/pact_broker/api/decorators/pact_webhooks_status_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/pacts_for_verification_query_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/provider_pacts_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/publish_contracts_results_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/reason_decorator_spec.rb
@@ -1406,7 +1424,6 @@ files:
 - spec/lib/pact_broker/api/decorators/triggered_webhooks_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/verifiable_pact_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/verifiable_pacts_decorator_spec.rb
-- spec/lib/pact_broker/api/decorators/verifiable_pacts_query_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/verification_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/verification_summary_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/version_decorator_spec.rb
@@ -1467,6 +1484,7 @@ files:
 - spec/lib/pact_broker/db/clean_incremental_spec.rb
 - spec/lib/pact_broker/db/clean_old_spec.rb
 - spec/lib/pact_broker/db/clean_spec.rb
+- spec/lib/pact_broker/db/data_migrations/create_branches_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
@@ -1571,6 +1589,9 @@ files:
 - spec/lib/pact_broker/verifications/service_spec.rb
 - spec/lib/pact_broker/verifications/summary_for_consumer_version_spec.rb
 - spec/lib/pact_broker/versions/abbreviate_number_spec.rb
+- spec/lib/pact_broker/versions/branch_service_spec.rb
+- spec/lib/pact_broker/versions/branch_version_repository_spec.rb
+- spec/lib/pact_broker/versions/branch_version_spec.rb
 - spec/lib/pact_broker/versions/parse_semantic_version_spec.rb
 - spec/lib/pact_broker/versions/repository_spec.rb
 - spec/lib/pact_broker/versions/service_spec.rb
@@ -1714,13 +1735,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.2.27
 signing_key: 
 specification_version: 4
 summary: See description
 test_files:
 - spec/features/base_equality_only_on_content_that_affects_verification_results_spec.rb
 - spec/features/can_i_deploy_spec.rb
+- spec/features/create_branch_version_spec.rb
 - spec/features/create_environment_spec.rb
 - spec/features/create_pacticipant_spec.rb
 - spec/features/create_tag_spec.rb
@@ -1740,6 +1762,7 @@ test_files:
 - spec/features/end_support_spec.rb
 - spec/features/execute_unsaved_webhook_spec.rb
 - spec/features/execute_webhook_spec.rb
+- spec/features/get_branch_version_spec.rb
 - spec/features/get_can_i_deploy_badge_spec.rb
 - spec/features/get_currently_deployed_versions_for_environment_spec.rb
 - spec/features/get_currently_deployed_versions_for_version_spec.rb
@@ -1841,11 +1864,11 @@ test_files:
 - spec/lib/pact/doc/markdown/index_renderer_spec.rb
 - spec/lib/pact_broker/api/contracts/environment_schema_spec.rb
 - spec/lib/pact_broker/api/contracts/pacticipant_schema_spec.rb
+- spec/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema_combinations_spec.rb
+- spec/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema_spec.rb
+- spec/lib/pact_broker/api/contracts/pacts_for_verification_query_string_schema_spec.rb
 - spec/lib/pact_broker/api/contracts/publish_contracts_schema_spec.rb
 - spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb
-- spec/lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema_combinations_spec.rb
-- spec/lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema_spec.rb
-- spec/lib/pact_broker/api/contracts/verifiable_pacts_query_schema_spec.rb
 - spec/lib/pact_broker/api/contracts/verification_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/webhook_contract_spec.rb
 - spec/lib/pact_broker/api/decorators/dashboard_decorator_spec.rb
@@ -1864,6 +1887,7 @@ test_files:
 - spec/lib/pact_broker/api/decorators/pact_webhooks_status_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/pacts_for_verification_query_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/provider_pacts_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/publish_contracts_results_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/reason_decorator_spec.rb
@@ -1875,7 +1899,6 @@ test_files:
 - spec/lib/pact_broker/api/decorators/triggered_webhooks_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/verifiable_pact_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/verifiable_pacts_decorator_spec.rb
-- spec/lib/pact_broker/api/decorators/verifiable_pacts_query_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/verification_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/verification_summary_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/version_decorator_spec.rb
@@ -1936,6 +1959,7 @@ test_files:
 - spec/lib/pact_broker/db/clean_incremental_spec.rb
 - spec/lib/pact_broker/db/clean_old_spec.rb
 - spec/lib/pact_broker/db/clean_spec.rb
+- spec/lib/pact_broker/db/data_migrations/create_branches_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
@@ -2040,6 +2064,9 @@ test_files:
 - spec/lib/pact_broker/verifications/service_spec.rb
 - spec/lib/pact_broker/verifications/summary_for_consumer_version_spec.rb
 - spec/lib/pact_broker/versions/abbreviate_number_spec.rb
+- spec/lib/pact_broker/versions/branch_service_spec.rb
+- spec/lib/pact_broker/versions/branch_version_repository_spec.rb
+- spec/lib/pact_broker/versions/branch_version_spec.rb
 - spec/lib/pact_broker/versions/parse_semantic_version_spec.rb
 - spec/lib/pact_broker/versions/repository_spec.rb
 - spec/lib/pact_broker/versions/service_spec.rb

data/lib/pact_broker/versions/lazy_loaders.rb

@@ -1,13 +0,0 @@
-module PactBroker
-  module Versions
-    module LazyLoaders
-      LATEST_VERSION_FOR_BRANCH = lambda {
-        self.class
-          .where(branch: branch, pacticipant_id: pacticipant_id)
-          .exclude(branch: nil)
-          .order(Sequel.desc(:order))
-          .limit(1)
-      }
-    end
-  end
-end