pact_broker 2.43.0 → 2.44.0

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

@@ -25,7 +25,7 @@ module PactBroker
           end
 
           let(:options) do
-            { latest: true, tag: "prod" }
+            { latest: true, tag: "prod", latestby: "cvp" }
           end
 
           before do
@@ -54,10 +54,10 @@ module PactBroker
           end
 
           let(:selectors) { [{ pacticipant_name: "Bar", latest: true, tag: "test" }]}
-          let(:options) { { tag: "prod" } }
+          let(:options) { { tag: "prod", latestby: "cvp" } }
 
           it "does not allow the consumer to be deployed" do
-            expect(subject.deployment_status_summary.deployable?).to_not be true
+            expect(subject.deployment_status_summary).to_not be_deployable
           end
         end
 
@@ -80,7 +80,7 @@ module PactBroker
           end
 
           it "does not allow the consumer to be deployed" do
-            expect(subject.deployment_status_summary.deployable?).to_not be true
+            expect(subject.deployment_status_summary).to_not be_deployable
           end
         end
 
@@ -101,18 +101,22 @@ module PactBroker
             [ { pacticipant_name: "Foo", pacticipant_version_number: "3.0.0" } ]
           end
 
-          let(:options) { {latest: true, tag: "prod"} }
+          let(:options) { {latest: true, tag: "prod", latestby: "cvp"} }
 
           it "returns 2 integrations" do
             expect(subject.integrations.size).to eq 2
           end
 
-          it "returns 1 row" do
-            expect(subject.rows.size).to eq 1
+          it "returns 1 row with a verification" do
+            expect(subject.rows.select(&:has_verification?).size).to eq 1
+          end
+
+          it "returns 1 row without a verification" do
+            expect(subject.rows.reject(&:has_verification?).size).to eq 1
           end
 
           it "does not allow the consumer to be deployed" do
-            expect(subject.deployment_status_summary.deployable?).to_not be true
+            expect(subject.deployment_status_summary).to_not be_deployable
           end
         end
 
@@ -133,7 +137,7 @@ module PactBroker
           end
 
           it "allows the old version of the consumer to be deployed" do
-            expect(subject.deployment_status_summary.deployable?).to be true
+            expect(subject.deployment_status_summary).to be_deployable
           end
         end
 
@@ -146,8 +150,8 @@ module PactBroker
             [ { pacticipant_name: "Bar", pacticipant_version_number: "5" } ]
           end
 
-          it "does not allow the provider to be deployed" do
-            expect(subject.deployment_status_summary.deployable?).to_not be true
+          it "does not allow the app to be deployed" do
+            expect(subject.deployment_status_summary).to_not be_deployable
           end
         end
 
@@ -162,20 +166,19 @@ module PactBroker
           end
 
           let(:options) do
-            { latest: true, tag: "prod" }
+            { latest: true, tag: "prod", latestby: "cvp" }
           end
 
           subject { Service.find(selectors, options) }
 
-          it "allows the provider to be deployed" do
-            expect(subject.deployment_status_summary.deployable?).to be true
+          it "allows the app to be deployed" do
+            expect(subject.deployment_status_summary).to be_deployable
           end
         end
 
         describe "when deploying a consumer to prod for the first time and the provider is not yet deployed" do
           before do
-            td.create_pact_with_hierarchy("Foo", "1", "Bar")
-            .create_verification(provider_version: "2")
+            td.create_pact_with_verification("Foo", "1", "Bar", "2")
           end
 
           let(:selectors) do
@@ -183,18 +186,17 @@ module PactBroker
           end
 
           let(:options) do
-            { latest: true, tag: "prod" }
+            { latest: true, tag: "prod", latestby: "cvp" }
           end
 
-          it "does not allow the consumer to be deployed" do
-            expect(subject.deployment_status_summary.deployable?).to_not be true
+          it "does not allow the app to be deployed" do
+            expect(subject.deployment_status_summary).to_not be_deployable
           end
         end
 
         describe "when deploying an app that is both a consumer and a provider to prod for the first time and the downstream provider is not yet deployed" do
           before do
-            td.create_pact_with_hierarchy("Foo", "1", "Bar")
-            .create_verification(provider_version: "2")
+            td.create_pact_with_verification("Foo", "1", "Bar", "2")
             .use_consumer("Bar")
             .use_consumer_version("2")
             .create_provider("Baz")
@@ -206,18 +208,19 @@ module PactBroker
           end
 
           let(:options) do
-            { latest: true, tag: "prod" }
+            { latest: true, tag: "prod", latestby: "cvp" }
           end
 
           it "does not allow the app to be deployed" do
-            expect(subject.deployment_status_summary.deployable?).to_not be true
+            expect(subject.deployment_status_summary).to_not be_deployable
           end
         end
 
         describe "when deploying an app that is both a consumer and a provider to prod for the first time and the downstream provider has been deployed" do
           before do
-            td.create_pact_with_hierarchy("Foo", "1", "Bar")
-            .create_verification(provider_version: "2")
+            # Foo v1 => Bar v2
+            # Bar v2 => Baz v4 (prod)
+            td.create_pact_with_verification("Foo", "1", "Bar", "2")
             .use_consumer("Bar")
             .use_consumer_version("2")
             .create_provider("Baz")
@@ -229,12 +232,64 @@ module PactBroker
             [ { pacticipant_name: "Bar", pacticipant_version_number: "2" } ]
           end
 
+          # Deploy Bar v2 to prod
           let(:options) do
-            { latest: true, tag: "prod" }
+            { latest: true, tag: "prod", latestby: "cvp" }
           end
 
           it "allows the app to be deployed" do
-            expect(subject.deployment_status_summary.deployable?).to be true
+            expect(subject.deployment_status_summary).to be_deployable
+          end
+        end
+
+        describe "when deploying a provider where the pact has not been verified" do
+          before do
+            # Foo v1 => Bar ?
+            td.create_pact_with_hierarchy("Foo", "1", "Bar")
+              .create_provider_version("2")
+          end
+
+          let(:selectors) do
+            [ { pacticipant_name: "Bar", pacticipant_version_number: "2" } ]
+          end
+
+          # Deploy Bar v2 to prod
+          let(:options) do
+            { latest: true, tag: "prod", latestby: "cvp" }
+          end
+
+          it "allows the app to be deployed" do
+            # no integrations and no matrix rows
+            expect(subject.deployment_status_summary).to be_deployable
+          end
+        end
+
+        describe "when deploying a consumer where the pact has been verified, but not by the required provider version" do
+          before do
+            # Foo v1 => Bar v2
+            td.create_pact_with_hierarchy("Foo", "1", "Bar")
+              .create_provider_version("2")
+              .create_provider_version_tag("prod")
+              .create_provider_version("3")
+              .create_verification(comment: "the verification is not from the required provider version")
+          end
+
+          let(:selectors) do
+            [ { pacticipant_name: "Foo", pacticipant_version_number: "1" } ]
+          end
+
+          # Deploy Foo v1 to prod
+          let(:options) do
+            { latest: true, tag: "prod", latestby: "cvp" }
+          end
+
+          # Currently returning PactNotEverVerifiedByProvider because the matrix response has changed from 'no row' to
+          # 'one row with no verification details' (left outer join stuff).
+          # Not sure if the 'no row' usecase can ever happen now.
+          # The messages shown to the user for 'not ever verified' and 'verified by the wrong provider version'
+          # are the same however, so the code does not need to be updated straight away.
+          it "returns a reason indicating that the pact has not been verified by the required provider version", pending: true do
+            expect(subject.deployment_status_summary.reasons.first).to be_a(PactBroker::Matrix::PactNotVerifiedByRequiredProviderVersion)
           end
         end
 
@@ -258,7 +313,7 @@ module PactBroker
             let(:options) { { latestby: "cvpv" } }
 
             it "does not allow the two apps to be deployed together" do
-              expect(subject.deployment_status_summary.deployable?).to_not be true
+              expect(subject.deployment_status_summary).to_not be_deployable
             end
           end
 
@@ -272,11 +327,75 @@ module PactBroker
             let(:options) { { latestby: "cvp", latest: true } }
 
             it "does not allow the two apps to be deployed together" do
-              expect(subject.deployment_status_summary.deployable?).to_not be true
+              expect(subject.deployment_status_summary).to_not be_deployable
+            end
+          end
+        end
+
+        describe "specifying a provider which has multiple prod versions of one consumer (explicit) and a single version of another (inferred)" do
+          before do
+            # Foo 1   (prod) -> Bar 2    [explicit]
+            # Foo 2   (prod) -> Bar 2    [explicit]
+            # Foo 3          -> Bar 2 failed [explicit]
+            # Cat 20  (prod) -> Bar ?    [inferred, missing verification]
+            # Dog 40         -> Bar 2 failed   [inferred, but not in prod]
+
+            td.create_pact_with_verification("Foo", "1", "Bar", "2")
+              .create_consumer_version_tag("prod")
+              .create_consumer_version("2")
+              .create_consumer_version_tag("prod")
+              .create_pact
+              .create_verification(provider_version: "2")
+              .create_consumer_version("3")
+              .create_pact
+              .create_verification(provider_version: "2", success: false, comment: "not prod, doesn't matter")
+              .create_consumer("Cat")
+              .create_consumer_version("20")
+              .create_consumer_version_tag("prod")
+              .create_pact
+              .comment("missing verification")
+              .create_consumer("Dog")
+              .create_consumer_version("40")
+              .create_pact
+              .create_verification(provider_version: "2")
+          end
+
+          let(:selector_1) { { pacticipant_name: "Bar", pacticipant_version_number: "2" } }
+          let(:selector_2) { { pacticipant_name: "Foo", tag: "prod" } }
+          let(:selectors)  { [ selector_1, selector_2 ] }
+
+          subject { Service.find(selectors, options) }
+
+          context "with inferred selectors" do
+            let(:options) { { latest: true, tag: "prod"} }
+
+            it "determines the number of integrations" do
+              expect(subject.integrations.size).to eq 3
+            end
+
+            it "finds all prod versions of Foo" do
+              expect(subject.select { |row| row.consumer_name == "Foo"}.size).to eq 2
+            end
+
+            it "finds the single prod version of Cat" do
+              expect(subject.select { |row| row.consumer_name == "Cat"}.size).to eq 1
+            end
+
+            it "is not deployable because of the missing verification for Cat v20" do
+              expect(subject.deployment_status_summary.reasons.size).to eq 1
+              expect(subject.deployment_status_summary.reasons.first).to be_a_pact_never_verified_for_consumer "Cat"
+            end
+          end
+
+          context "without inferred selectors" do
+            let(:options) { {} }
+
+            it "is deployable" do
+              expect(subject.deployment_status_summary).to be_deployable
             end
           end
         end
       end
     end
   end
-end
+end

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

@@ -48,9 +48,9 @@ module PactBroker
         subject { shorten_rows(rows) }
         let(:results) { Repository.new.find(selectors, options) }
 
-        it "returns an empty array" do
-          expect(results).to eq []
-          expect(results.resolved_selectors.find{ |s | s[:pacticipant_name] == "Bar"}[:pacticipant_version_id]).to eq -1
+        it "returns an array with one row that does not have a verification" do
+          expect(results.first).to_not have_verification
+          expect(results.resolved_selectors.find{ |s | s[:pacticipant_name] == "Bar"}.pacticipant_version_id).to eq -1
         end
       end
     end

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

@@ -54,7 +54,7 @@ module PactBroker
 
         context "when a limit is specified" do
           let(:selectors) { build_selectors('A' => nil) }
-          let(:options) { {limit: 1} }
+          let(:options) { { limit: 1 } }
 
           it "returns fewer rows than the limit (because some of the logic is done in the code, there may be fewer than the limit - need to fix this)" do
             expect(subject).to eq ["A2 B? n?"]
@@ -606,7 +606,7 @@ module PactBroker
           end
 
           it "returns the tag information" do
-            expect(subject.first[:provider_version_tags]).to include_hash_matching name: 'prod', latest: 1
+            expect(subject.first.provider_version_tags).to include_hash_matching name: 'prod', latest: 1
           end
         end
 
@@ -647,8 +647,9 @@ module PactBroker
             ]
           end
 
-          it "returns no data" do
-            expect(subject.size).to eq 0
+          it "returns a row with no verification" do
+            expect(subject.size).to eq 1
+            expect(subject.first).to_not have_verification
           end
         end
       end

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

@@ -60,10 +60,10 @@ module PactBroker
       end
       describe "#find_by_name" do
         before do
-          TestDataBuilder.new.create_pacticipant("Foo Bar")
+          td.create_pacticipant("Foo-Bar")
         end
 
-        subject { Repository.new.find_by_name('foo bar') }
+        subject { Repository.new.find_by_name('foo-bar') }
 
         context "when the name is a different case" do
           context "with case sensitivity turned on" do
@@ -83,9 +83,43 @@ module PactBroker
 
             it "returns the pacticipant" do
               expect(subject).to_not be nil
-              expect(subject.name).to eq "Foo Bar"
+              expect(subject.name).to eq "Foo-Bar"
             end
           end
+
+          context "with case sensitivity turned off and multiple records found", skip: DB.mysql?  do
+            # Can't be created in MySQL - duplicate record
+            before do
+              td.create_pacticipant("Foo-bar")
+              allow(PactBroker.configuration).to receive(:use_case_sensitive_resource_names).and_return(false)
+            end
+
+            it "raises an error" do
+              expect { subject }.to raise_error PactBroker::Error, /Found multiple pacticipants.*foo-bar/
+            end
+          end
+
+          context "with case sensitivity turned off and searching for a name with an underscore" do
+            before do
+              allow(PactBroker.configuration).to receive(:use_case_sensitive_resource_names).and_return(false)
+            end
+
+            subject { Repository.new.find_by_name('foo_bar') }
+
+            it { is_expected.to be nil }
+          end
+
+          context "with case sensitivity turned on and searching for a name with an underscore" do
+            subject { Repository.new.find_by_name('foo_bar') }
+
+            it { is_expected.to be nil }
+          end
+
+          context "with case sensitivity turned off no record found" do
+            subject { Repository.new.find_by_name('blah') }
+
+            it { is_expected.to be nil }
+          end
         end
       end
 

data/spec/service_consumers/provider_states_for_pact_ruby.rb

@@ -143,4 +143,16 @@ Pact.provider_states_for "Pact Ruby" do
         .create_pact
     end
   end
+
+  provider_state "the relation for retrieving pacts for verifications exists in the index resource" do
+      no_op
+    end
+
+    provider_state "Foo has a pact tagged cdev with provider Bar" do
+      set_up do
+        TestDataBuilder.new
+          .create_pact_with_hierarchy("Foo", "1", "Bar")
+          .create_consumer_version_tag("cdev")
+      end
+    end
 end

data/spec/support/shared_examples_for_responses.rb

@@ -76,3 +76,10 @@ RSpec::Matchers.define :include_hash_matching do |expected|
     end
   end
 end
+
+RSpec::Matchers.define :be_a_pact_never_verified_for_consumer do | expected_consumer_name |
+  match do | actual_reason |
+    expect(actual_reason).to be_a(PactBroker::Matrix::PactNotEverVerifiedByProvider)
+    expect(actual_reason.consumer_selector.pacticipant_name).to eq expected_consumer_name
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.43.0
+  version: 2.44.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-05 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -174,16 +174,22 @@ dependencies:
   name: pact-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
   name: padrino-core
   requirement: !ruby/object:Gem::Requirement
@@ -1006,6 +1012,7 @@ files:
 - lib/pact_broker/matrix/aggregated_row.rb
 - lib/pact_broker/matrix/can_i_deploy_query_schema.rb
 - lib/pact_broker/matrix/deployment_status_summary.rb
+- lib/pact_broker/matrix/every_row.rb
 - lib/pact_broker/matrix/head_row.rb
 - lib/pact_broker/matrix/integration.rb
 - lib/pact_broker/matrix/parse_can_i_deploy_query.rb
@@ -1032,7 +1039,7 @@ files:
 - lib/pact_broker/pacts/generate_interaction_sha.rb
 - lib/pact_broker/pacts/generate_sha.rb
 - lib/pact_broker/pacts/head_pact.rb
-- lib/pact_broker/pacts/latest_pact_publication_id_by_consumer_version.rb
+- lib/pact_broker/pacts/latest_pact_publication_id_for_consumer_version.rb
 - lib/pact_broker/pacts/latest_pact_publications.rb
 - lib/pact_broker/pacts/latest_pact_publications_by_consumer_version.rb
 - lib/pact_broker/pacts/latest_tagged_pact_publications.rb
@@ -1417,6 +1424,7 @@ files:
 - spec/lib/pact_broker/labels/service_spec.rb
 - spec/lib/pact_broker/matrix/aggregated_row_spec.rb
 - spec/lib/pact_broker/matrix/deployment_status_summary_spec.rb
+- spec/lib/pact_broker/matrix/every_row_spec.rb
 - spec/lib/pact_broker/matrix/head_row_spec.rb
 - spec/lib/pact_broker/matrix/integration_spec.rb
 - spec/lib/pact_broker/matrix/parse_query_spec.rb
@@ -1789,6 +1797,7 @@ test_files:
 - spec/lib/pact_broker/labels/service_spec.rb
 - spec/lib/pact_broker/matrix/aggregated_row_spec.rb
 - spec/lib/pact_broker/matrix/deployment_status_summary_spec.rb
+- spec/lib/pact_broker/matrix/every_row_spec.rb
 - spec/lib/pact_broker/matrix/head_row_spec.rb
 - spec/lib/pact_broker/matrix/integration_spec.rb
 - spec/lib/pact_broker/matrix/parse_query_spec.rb