pact_broker 2.88.0 → 2.89.0

data/spec/lib/pact_broker/api/decorators/pacts_for_verification_query_decorator_spec.rb

@@ -125,6 +125,16 @@ module PactBroker
               expect(subject.consumer_version_selectors.last).to eq PactBroker::Pacts::Selector.for_currently_supported
             end
           end
+
+          context "when matchingBranch is true" do
+            let(:consumer_version_selectors) do
+              [{ "matchingBranch" => true }]
+            end
+
+            it "sets the branch and latest and matching branch properties" do
+              expect(subject.consumer_version_selectors).to contain_exactly(have_attributes(branch: "main", matching_branch: true, latest: true))
+            end
+          end
         end
 
         context "when parsing query string params" do

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

@@ -124,6 +124,70 @@ module PactBroker
           end
         end
       end
+
+      describe "#conflict_errors" do
+        let(:contracts_to_publish) do
+          ContractsToPublish.from_hash(
+            pacticipant_name: "Foo",
+            pacticipant_version_number: "1",
+            tags: ["a", "b"],
+            branch: branch,
+            contracts: contracts
+          )
+        end
+
+        let(:on_conflict) { "overwrite" }
+        let(:branch) { "main" }
+        let(:contracts) { [contract_1] }
+        let(:contract_1) do
+          ContractToPublish.from_hash(
+            consumer_name: "Foo",
+            provider_name: "Bar",
+            decoded_content: decoded_contract,
+            specification: "pact",
+            on_conflict: on_conflict
+          )
+        end
+
+        let(:contract_hash) { { consumer: { name: "Foo" }, provider: { name: "Bar" }, interactions: [{a: "b"}] } }
+        let(:decoded_contract) { contract_hash.to_json }
+
+        subject { Service.conflict_notices(contracts_to_publish) }
+
+        context "when a pact already exists" do
+          before do
+            allow(PactBroker.configuration).to receive(:allow_dangerous_contract_modification).and_return(allow_dangerous_contract_modification)
+            td.create_pact_with_hierarchy("Foo", "1", "Bar", existing_json_content)
+          end
+
+          let(:existing_json_content) { td.random_json_content("Foo", "Bar") }
+
+          context "when allow_dangerous_contract_modification=false and the pact content is different" do
+            let(:allow_dangerous_contract_modification) { false }
+
+            it "returns errors" do
+              expect(subject).to_not be_empty
+            end
+          end
+
+          context "when allow_dangerous_contract_modification=false and the pact content is the same" do
+            let(:allow_dangerous_contract_modification) { false }
+            let(:existing_json_content) { decoded_contract }
+
+            it { is_expected.to be_empty }
+          end
+
+          context "when allow_dangerous_contract_modification=true and the pact content is different" do
+            let(:allow_dangerous_contract_modification) { true }
+
+            it { is_expected.to be_empty }
+          end
+        end
+
+        context "when no pacts exist" do
+          it { is_expected.to be_empty }
+        end
+      end
     end
   end
 end

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

@@ -112,12 +112,15 @@ module PactBroker
           end
 
           it "returns the required verification for the main branch" do
-            expect(subject).to eq [
-              RequiredVerification.new(
+            expect(subject).to contain_exactly(
+              have_attributes(
                 provider_version: td.find_version("Bar", "1"),
+                provider_version_selectors: contain_exactly(
+                  have_attributes(resolved_branch_name: "main", main_branch: true)
+                ),
                 provider_version_descriptions: ["latest from main branch"]
               )
-            ]
+            )
           end
         end
 
@@ -153,6 +156,7 @@ module PactBroker
             expect(subject).to eq [
               RequiredVerification.new(
                 provider_version: td.find_version("Bar", "1"),
+                provider_version_selectors: PactBroker::Versions::Selectors.new(PactBroker::Versions::Selector.for_currently_deployed),
                 provider_version_descriptions: ["deployed in test"]
               )
             ]
@@ -193,6 +197,7 @@ module PactBroker
             expect(subject).to eq [
               RequiredVerification.new(
                 provider_version: td.find_version("Bar", "1"),
+                provider_version_selectors: PactBroker::Versions::Selectors.new(PactBroker::Versions::Selector.for_currently_supported),
                 provider_version_descriptions: ["released in test"]
               )
             ]
@@ -231,15 +236,16 @@ module PactBroker
           end
 
           it "deduplicates the required versions" do
-            expect(subject).to eq [
-              RequiredVerification.new(
-              provider_version: td.find_version("Bar", "1"),
-              provider_version_descriptions: [
-                "latest from main branch",
-                "deployed in test",
-                "released in test"
-              ])
-            ]
+            expect(subject.size).to eq 1
+            expect(subject.first.provider_version).to eq td.find_version("Bar", "1")
+            expect(subject.first.provider_version_selectors[0]).to have_attributes(main_branch: true, resolved_branch_name: "main")
+            expect(subject.first.provider_version_selectors[1]).to eq PactBroker::Versions::Selector.for_currently_deployed
+            expect(subject.first.provider_version_selectors[2]).to eq PactBroker::Versions::Selector.for_currently_supported
+            expect(subject.first.provider_version_descriptions).to eq [
+                                                                        "latest from main branch",
+                                                                        "deployed in test",
+                                                                        "released in test"
+                                                                      ]
           end
         end
       end

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

@@ -1,4 +1,6 @@
 require "pact_broker/webhooks/trigger_service"
+require "pact_broker/versions/selectors"
+require "pact_broker/versions/selector"
 
 module PactBroker
   module Webhooks
@@ -59,7 +61,8 @@ module PactBroker
         let(:pact) { instance_double(PactBroker::Domain::Pact, consumer: consumer, provider: provider, consumer_version: consumer_version)}
         let(:consumer_version) { PactBroker::Domain::Version.new(number: "1.2.3") }
         let(:consumer) { PactBroker::Domain::Pacticipant.new(name: "Consumer") }
-        let(:provider) { PactBroker::Domain::Pacticipant.new(name: "Provider") }
+        let(:provider) { PactBroker::Domain::Pacticipant.new(name: "Provider", main_branch: provider_main_branch) }
+        let(:provider_main_branch) { "main" }
         let(:webhooks) { [webhook]}
         let(:webhook) do
           instance_double(PactBroker::Domain::Webhook,
@@ -127,10 +130,14 @@ module PactBroker
             let(:required_verifications) { [required_verification] }
             let(:required_verification) do
               instance_double("PactBroker::Verifications::RequiredVerification",
-                provider_version: double("version", number: "1"),
+                provider_version: double("version", number: "1", branch_versions: branch_versions),
+                provider_version_selectors: provider_version_selectors,
                 provider_version_descriptions: ["foo"]
               )
             end
+            let(:provider_version_selectors) { [instance_double("PactBroker::Versions::ResolvedSelector", latest_for_main_branch?: latest_for_main_branch, resolved_branch_name: "the-main-branch")] }
+            let(:latest_for_main_branch) { true }
+            let(:branch_versions) { [instance_double("PactBroker::Versions::BranchVersion", branch_name: "main")] }
 
             it "creates a triggered webhook for each required verification" do
               expect(webhook_repository).to receive(:create_triggered_webhook).with(
@@ -140,7 +147,7 @@ module PactBroker
                 verification,
                 TriggerService::RESOURCE_CREATION,
                 PactBroker::Webhooks::WebhookEvent::CONTRACT_REQUIRING_VERIFICATION_PUBLISHED,
-                expected_event_context.merge(provider_version_number: "1", provider_version_descriptions: ["foo"])
+                expected_event_context.merge(provider_version_number: "1", provider_version_branch: "the-main-branch", provider_version_descriptions: ["foo"])
               )
               subject
             end
@@ -149,6 +156,63 @@ module PactBroker
               expect(subject.size).to eq 1
             end
 
+            context "when a version is required because it was the main branch" do
+              it "uses the main branch" do
+                expect(webhook_repository).to receive(:create_triggered_webhook).with(
+                  anything,
+                  anything,
+                  anything,
+                  anything,
+                  anything,
+                  anything,
+                  hash_including(provider_version_branch: "the-main-branch")
+                )
+                subject
+              end
+            end
+
+            context "when a version was required but not because it was for the main branch" do
+              let(:latest_for_main_branch) { false }
+
+              context "when there are multiple branches" do
+                let(:branch_versions) do
+                  [
+                    instance_double("PactBroker::Versions::BranchVersion", branch_name: "foo"),
+                    instance_double("PactBroker::Versions::BranchVersion", branch_name: "bar")
+                  ]
+                end
+                it "uses the last branch" do
+                  expect(webhook_repository).to receive(:create_triggered_webhook).with(
+                    anything,
+                    anything,
+                    anything,
+                    anything,
+                    anything,
+                    anything,
+                    hash_including(provider_version_branch: "bar")
+                 )
+                 subject
+                end
+              end
+
+              context "when there are no branches" do
+                let(:branch_versions) { [] }
+
+                it "uses nil" do
+                  expect(webhook_repository).to receive(:create_triggered_webhook).with(
+                    anything,
+                    anything,
+                    anything,
+                    anything,
+                    anything,
+                    anything,
+                    hash_including(provider_version_branch: nil)
+                 )
+                 subject
+                end
+              end
+            end
+
             context "when there are no required verifications" do
               let(:required_verifications) { [] }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.88.0
+  version: 2.89.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -1113,6 +1113,8 @@ files:
 - lib/pact_broker/versions/latest_version.rb
 - lib/pact_broker/versions/parse_semantic_version.rb
 - lib/pact_broker/versions/repository.rb
+- lib/pact_broker/versions/selector.rb
+- lib/pact_broker/versions/selectors.rb
 - lib/pact_broker/versions/sequence.rb
 - lib/pact_broker/versions/service.rb
 - lib/pact_broker/webhooks/check_host_whitelist.rb
@@ -1277,11 +1279,26 @@ files:
 - script/foo-bar.json
 - script/generate-certificates-for-webooks-certificate-spec.rb
 - script/generate-erd
+- script/github-issues/add-branch-support-for-provider-versions/issue-text.txt
+- script/github-issues/add-branch-support-for-provider-versions/issues.txt
+- script/github-issues/add-branch-support-for-provider-versions/raise-issue-in-client-repos.sh
+- script/github-issues/add-branch-support/issue-text.txt
+- script/github-issues/add-branch-support/issues.txt
+- script/github-issues/add-branch-support/raise-issue-in-client-repos.sh
+- script/github-issues/branch-consumer-version-selector/issue-text.txt
+- script/github-issues/branch-consumer-version-selector/issues.txt
+- script/github-issues/branch-consumer-version-selector/raise-issue-in-client-repos.sh
+- script/github-issues/consumer-version-selectors-docs/issue-text.txt
+- script/github-issues/consumer-version-selectors-docs/issues.txt
+- script/github-issues/consumer-version-selectors-docs/raise-issue-in-client-repos.sh
+- script/github-issues/deployed-and-released-selectors-docs/issue-text.txt
+- script/github-issues/deployed-and-released-selectors-docs/issues.txt
+- script/github-issues/deployed-and-released-selectors-docs/raise-issue-in-client-repos.sh
+- script/github-issues/include-pending-by-default/issue-text.txt
+- script/github-issues/include-pending-by-default/issues.txt
+- script/github-issues/include-pending-by-default/raise-issue-in-client-repos.sh
 - script/import-pg-database.sh
 - script/insert-self-signed-certificate-from-url.rb
-- script/issues/consumer-version-selectors-docs/issue-text.txt
-- script/issues/consumer-version-selectors-docs/issues.txt
-- script/issues/consumer-version-selectors-docs/raise-issue-in-client-repos.sh
 - script/prod/clean-up.sql
 - script/prod/migrate-latest-pacts.sh
 - script/prod/redact-data.sql