pact_broker 2.8.0.beta.4 → 2.8.0.beta.5

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.8.0.beta.4'
+  VERSION = '2.8.0.beta.5'
 end

data/script/seed-matrix.rb

@@ -42,8 +42,9 @@ A -> B ->  C
 TestDataBuilder.new
   .create_pact_with_hierarchy("A", "1", "B")
   .create_verification(provider_version: '1', success: false)
-  .create_verification(provider_version: '2', number: 2)
-  .create_verification(provider_version: '4', number: 3)
+  .create_verification(provider_version: '1', number: 2, success: true)
+  .create_verification(provider_version: '2', number: 3)
+  .create_verification(provider_version: '4', number: 4)
   .create_provider_version("5")
   .use_consumer("B")
   .use_consumer_version("1")
@@ -55,17 +56,23 @@ TestDataBuilder.new
   .create_verification(provider_version: '2', success: true)
   .create_consumer_version("3")
   .create_pact
-  .create_pact_with_hierarchy("the-example-application", "391c43cae8c0e83c570c191f7324fccd67e53abc", "another-example-application")
-  .create_verification(provider_version: '391c43cae8c0e83c570c191f7324fccd67e53abc')
-  .create_verification(provider_version: '57fa24e44efc4d8aa42bb855a8217f145b5b1b5b', number: 2, success: false)
-  .create_verification(provider_version: '4', number: 3)
-  .use_consumer("another-example-application")
-  .use_consumer_version("391c43cae8c0e83c570c191f7324fccd67e53abc")
-  .create_provider("a-third-example-application")
+  .use_consumer("A")
+  .create_consumer_version("2")
+  .use_provider("B")
   .create_pact
-  .create_verification(provider_version: '391c43cae8c0e83c570c191f7324fccd67e53abc', success: false)
-  .use_consumer_version("57fa24e44efc4d8aa42bb855a8217f145b5b1b5b")
-  .create_pact
-  .create_verification(provider_version: '57fa24e44efc4d8aa42bb855a8217f145b5b1b5b', success: true)
+  .create_verification(provider_version: '5')
+
+  # .create_pact_with_hierarchy("the-example-application", "391c43cae8c0e83c570c191f7324fccd67e53abc", "another-example-application")
+  # .create_verification(provider_version: '391c43cae8c0e83c570c191f7324fccd67e53abc')
+  # .create_verification(provider_version: '57fa24e44efc4d8aa42bb855a8217f145b5b1b5b', number: 2, success: false)
+  # .create_verification(provider_version: '4', number: 3)
+  # .use_consumer("another-example-application")
+  # .use_consumer_version("391c43cae8c0e83c570c191f7324fccd67e53abc")
+  # .create_provider("a-third-example-application")
+  # .create_pact
+  # .create_verification(provider_version: '391c43cae8c0e83c570c191f7324fccd67e53abc', success: false)
+  # .use_consumer_version("57fa24e44efc4d8aa42bb855a8217f145b5b1b5b")
+  # .create_pact
+  # .create_verification(provider_version: '57fa24e44efc4d8aa42bb855a8217f145b5b1b5b', success: true)
 
 

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

@@ -18,8 +18,8 @@ module PactBroker
               provider_version_number: "4.5.6",
               provider_name: "Provider",
               success: line_1_success,
-              number: 1,
-              build_url: nil,
+              verification_number: 1,
+              verification_build_url: nil,
               verification_executed_at: verification_date
             }
           end
@@ -33,8 +33,8 @@ module PactBroker
               provider_version_number: nil,
               provider_name: "Provider",
               success: line_2_success,
-              number: nil,
-              build_url: nil,
+              verification_number: nil,
+              verification_build_url: nil,
               verification_executed_at: verification_date
             }
           end
@@ -160,6 +160,18 @@ module PactBroker
               expect(parsed_json[:summary][:reason]).to match /have failed/
             end
           end
+
+          context "when there are no results" do
+            let(:lines) { [] }
+
+            it "has a deployable flag of false" do
+              expect(parsed_json[:summary][:deployable]).to be nil
+            end
+
+            it "has an explanation" do
+              expect(parsed_json[:summary][:reason]).to match /No results/
+            end
+          end
         end
       end
     end

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

@@ -11,7 +11,265 @@ module PactBroker
         end
       end
 
+      def shorten_row row
+        "#{row[:consumer_name]}#{row[:consumer_version_number]} #{row[:provider_name]}#{row[:provider_version_number] || '?'} n#{row[:verification_number] || '?'}"
+      end
+
+      def shorten_rows rows
+        rows.collect{ |r| shorten_row(r) }
+      end
+
+      describe "find" do
+        before do
+          # A1 - B1
+          # A1 - B1 r2
+          # A1 - B2 r3
+          # A1 - C1
+          # A2 - B?
+          # A2 - C2
+          td.create_pact_with_hierarchy("A", "1", "B")
+            .create_verification(provider_version: '1', success: false)
+            .create_verification(provider_version: '1', number: 2, success: true)
+            .create_verification(provider_version: '2', number: 3, success: true)
+            .create_provider("C")
+            .create_pact
+            .create_verification(provider_version: '1')
+            .create_consumer_version("2")
+            .create_pact
+            .create_verification(provider_version: '3')
+            .use_provider("B")
+            .create_pact
+        end
+
+        subject { shorten_rows(Repository.new.find(selectors, options)) }
+
+        let(:options) { { latestby: latestby } }
+        let(:latestby) { nil }
+        let(:a1_b1_n1) { "A1 B1 n1" }
+        let(:a1_b1_n2) { "A1 B1 n2" }
+        let(:a1_b2_n3) { "A1 B2 n3" }
+        let(:a1_c1_n1) { "A1 C1 n1" }
+        let(:a2_b__n_) { "A2 B? n?" }
+
+        context "when a limit is specified" do
+          let(:selectors) { build_selectors('A' => nil) }
+          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?"]
+          end
+        end
+
+        context "when just the consumer name is specified" do
+          let(:selectors) { build_selectors('A' => nil) }
+
+          context "when no latestby is specified" do
+            it "returns all rows" do
+              expect(subject).to include a1_b1_n1
+              expect(subject).to include a1_b1_n2
+              expect(subject).to include a1_c1_n1
+              expect(subject).to include a2_b__n_
+              expect(subject.size).to eq 6
+            end
+          end
+
+          context "when latestby=cvpv" do
+            let(:latestby) { 'cvpv' }
+
+            it "returns the latest rows per consumer version/provider version" do
+              expect(subject).to_not include a1_b1_n1
+              expect(subject).to include a1_b1_n2
+              expect(subject).to include a1_c1_n1
+              expect(subject).to include a2_b__n_
+              expect(subject.size).to eq 5
+            end
+          end
+
+          context "when latestby=cvp" do
+            let(:latestby) { 'cvp' }
+
+            it "returns the latest row for each provider for each consumer version" do
+              expect(subject).to_not include a1_b1_n1
+              expect(subject).to_not include a1_b1_n2
+              expect(subject).to include a1_b2_n3
+              expect(subject).to include a1_c1_n1
+              expect(subject).to include a2_b__n_
+              expect(subject.size).to eq 4
+            end
+          end
+
+          context "when latestby=cp", pending: true do
+            let(:latestby) { 'cp' }
+
+            it "returns the latest rows per consumer/provider" do
+              expect(subject).to include "A2 C3 n1"
+              expect(subject).to include "A2 B? n?"
+              expect(subject).to include a1_c1_n1
+              expect(subject).to_not include a1_b2_n3
+              expect(subject.size).to eq 2
+            end
+          end
+        end
+
+        context "when the consumer name/version are specified" do
+          let(:selectors) { build_selectors('A' => '1') }
+
+          context "when no latestby is specified" do
+            it "returns all the rows for the consumer version" do
+              expect(subject.size).to eq 4
+            end
+          end
+
+          context "when latestby=cvpv" do
+            let(:latestby) { 'cvpv' }
+
+            it "returns the latest verification for each provider version for the specified consumer version" do
+              expect(subject).to_not include a1_b1_n1
+              expect(subject).to include a1_b1_n2
+              expect(subject).to include a1_c1_n1
+              expect(subject.size).to eq 3
+            end
+          end
+
+          context "when latestby=cvp" do
+            let(:latestby) { 'cvp' }
+
+            it "returns the latest verifications for each provider for the specified consumer version" do
+              expect(subject).to_not include a1_b1_n1
+              expect(subject).to_not include a1_b1_n2
+              expect(subject).to include a1_b2_n3
+              expect(subject).to include a1_c1_n1
+              expect(subject.size).to eq 2
+            end
+          end
+
+          context "when latestby=cp" do
+            let(:latestby) { 'cp' }
+
+            it "returns the same as latestby=cvp" do
+              expect(subject).to_not include a1_b1_n1
+              expect(subject).to_not include a1_b1_n2
+              expect(subject).to include a1_b2_n3
+              expect(subject).to include a1_c1_n1
+              expect(subject.size).to eq 2
+            end
+          end
+        end
+
+        context "when the consumer name/version and the provider name are specified" do
+          let(:selectors) { build_selectors('A' => '1', 'B' => nil) }
+
+          context "when no latestby is specified" do
+            it "returns all the rows for the given consumer version and given provider" do
+              expect(subject).to include a1_b1_n1
+              expect(subject).to include a1_b1_n2
+              expect(subject).to include a1_b2_n3
+              expect(subject).to_not include a1_c1_n1
+              expect(subject.size).to eq 3
+            end
+          end
+
+          context "when latestby=cvpv" do
+            let(:latestby) { 'cvpv' }
+
+            it "returns the latest verification for each provider version for the given consumer version" do
+              expect(subject).to_not include a1_b1_n1
+              expect(subject).to include a1_b1_n2
+              expect(subject).to include a1_b2_n3
+              expect(subject).to_not include a1_c1_n1
+              expect(subject.size).to eq 2
+            end
+          end
+
+          context "when latestby=cvp" do
+            let(:latestby) { 'cvp' }
+
+            it "returns the latest verification for the given provider for the given consumer version" do
+              expect(subject).to_not include a1_b1_n1
+              expect(subject).to_not include a1_b1_n2
+              expect(subject).to include a1_b2_n3
+              expect(subject).to_not include a1_c1_n1
+              expect(subject.size).to eq 1
+            end
+          end
+
+          context "when latestby=cp" do
+            let(:latestby) { 'cp' }
+
+            it "returns the same as latestby=cvp" do
+              expect(subject).to_not include a1_b1_n1
+              expect(subject).to_not include a1_b1_n2
+              expect(subject).to include a1_b2_n3
+              expect(subject).to_not include a1_c1_n1
+              expect(subject.size).to eq 1
+            end
+          end
+        end
+
+        context "when the consumer name/version and provider name/version are specified" do
+          let(:selectors) { build_selectors('A' => '1', 'B' => '1') }
+
+          context "when no latestby is specified" do
+            it "returns all the rows for the given consumer/version and given provider/version" do
+              expect(subject).to include a1_b1_n1
+              expect(subject).to include a1_b1_n2
+              expect(subject).to_not include a1_b2_n3
+              expect(subject).to_not include a1_c1_n1
+              expect(subject.size).to eq 2
+            end
+          end
+
+          context "when latestby=cvpv" do
+            let(:latestby) { 'cvpv' }
+
+            it "returns the latest verification for the given provider version for the given consumer version" do
+              expect(subject).to include a1_b1_n2
+              expect(subject.size).to eq 1
+            end
+          end
+
+          context "when latestby=cvp" do
+            let(:latestby) { 'cvp' }
+
+            it "returns the same as latestby=cvpv" do
+              expect(subject).to include a1_b1_n2
+              expect(subject.size).to eq 1
+            end
+          end
+
+          context "when latestby=cp" do
+            let(:latestby) { 'cp' }
+
+            it "returns the same as latestby=cvp" do
+              expect(subject).to include a1_b1_n2
+              expect(subject.size).to eq 1
+            end
+          end
+        end
+      end
+
       describe "find" do
+        let(:options) { {} }
+
+        subject { Repository.new.find(selectors, options) }
+
+        context "when a pact is revised, then verified" do
+          before do
+            td.create_pact_with_hierarchy("A", "1", "B")
+              .revise_pact
+              .create_verification(provider_version: "1")
+          end
+
+          context "when latestby=cvpv" do
+            let(:selectors) { build_selectors('A' => '1', 'B' => '1')}
+            let(:options) { { latestby: 'cvpv' } }
+
+            it "returns one row" do
+              expect(shorten_rows(subject)).to eq ['A1 B1 n1']
+            end
+          end
+        end
+
         context "when the provider version resource exists but there is no verification for that version" do
           before do
             # A/1.2.3 -> B
@@ -24,8 +282,7 @@ module PactBroker
               .create_version("3.0.0")
               .create_pact
           end
-
-          subject { Repository.new.find build_selectors("A" => "1.2.3", "B" => "2.0.0", "C" => "3.0.0") }
+          let(:selectors) { build_selectors("A" => "1.2.3", "B" => "2.0.0", "C" => "3.0.0") }
 
           it "returns a row for each pact" do
             expect(subject.size).to eq 2
@@ -46,8 +303,6 @@ module PactBroker
           context "when only 2 version selectors are specified" do
             let(:selectors) { build_selectors("A" => "1.2.3", "B" => "2.0.0") }
 
-            subject { Repository.new.find(selectors) }
-
             it "only returns 1 row" do
               expect(subject.size).to eq 1
             end
@@ -66,7 +321,7 @@ module PactBroker
               .create_verification(provider_version: "4.5.6")
           end
 
-          subject { Repository.new.find build_selectors("A" => "1.2.3") }
+          let(:selectors) { build_selectors("A" => "1.2.3") }
 
           it "returns a row for each verification for that version" do
             expect(subject.size).to eq 2
@@ -84,7 +339,7 @@ module PactBroker
               .create_pact_with_hierarchy("X", "1.2.3", "Y")
           end
 
-          subject { Repository.new.find build_selectors("A" => nil) }
+          let(:selectors) { build_selectors("A" => nil) }
 
           it "returns a row for each verification for the pacticipant" do
             expect(subject.collect{|r| r[:consumer_name]}.uniq).to eq ["A"]
@@ -105,7 +360,7 @@ module PactBroker
               .create_verification(provider_version: "6.7.8", number: 2)
           end
 
-          subject { Repository.new.find build_selectors("B" => "4.5.6") }
+          let(:selectors) { build_selectors("B" => "4.5.6") }
 
           it "returns a row for each verification for that version" do
             expect(subject.size).to eq 2
@@ -125,7 +380,11 @@ module PactBroker
               .create_verification(provider_version: "6.7.8", number: 2)
           end
 
-          subject { Repository.new.find build_selectors("B" => nil) }
+          before do
+            options.delete(:scope)
+          end
+
+          let(:selectors) { build_selectors("B" => nil) }
 
           it "returns a row for each verification for that version" do
             expect(subject.size).to eq 3
@@ -148,7 +407,7 @@ module PactBroker
               .create_verification(provider_version: '1', success: false)
           end
 
-          subject { Repository.new.find build_selectors("B" => "1") }
+          let(:selectors) { build_selectors("B" => "1") }
 
           it "returns rows where the pacticipant is the consumer and rows where the pacticipant is the provider" do
             # A/1 and B/1
@@ -170,10 +429,10 @@ module PactBroker
 
           let(:selectors) { build_selectors("A" => nil, "B" => nil) }
 
-          subject { Repository.new.find(selectors, options) }
-
           context "when the success option is not set" do
-            let(:options) { { } }
+            before do
+              options.delete(:success)
+            end
 
             it "returns all rows specified by the selectors" do
               expect(subject.size).to eq 3
@@ -181,34 +440,42 @@ module PactBroker
           end
 
           context "when the success option is true" do
-            let(:options) { { success: [true] } }
+            before do
+              options[:success] = [true]
+            end
 
             it "only includes successes" do
-              expect(subject.first[:provider_version_number]).to eq "1.0.0"
+              expect(subject).to include_hash_matching provider_version_number: "1.0.0"
               expect(subject.size).to eq 1
             end
           end
 
           context "when the success option is false" do
-            let(:options) { { success: [false] } }
+            before do
+              options[:success] = [false]
+            end
 
             it "only includes failures" do
-              expect(subject.first[:provider_version_number]).to eq "2.0.0"
+              expect(subject).to include_hash_matching provider_version_number: "2.0.0"
               expect(subject.size).to eq 1
             end
           end
 
           context "when the success option is nil" do
-            let(:options) { { success: [nil] } }
+            before do
+              options[:success] = [nil]
+            end
 
             it "only includes unverified rows" do
-              expect(subject.first[:provider_version_number]).to eq nil
+              expect(subject).to include_hash_matching provider_version_number: nil
               expect(subject.size).to eq 1
             end
           end
 
           context "when multiple success options are specified" do
-            let(:options) { { success: [false, nil] } }
+            before do
+              options[:success] = [false, nil]
+            end
 
             it "returns all matching rows" do
               # postgres orders differently, and ruby array sort blows up with a nil string
@@ -220,7 +487,7 @@ module PactBroker
           end
         end
 
-        context "when the latest tag is specified for a provider instead of a version" do
+        context "when the latest tag is specified for a provider" do
           before do
             td.create_pact_with_hierarchy("A", "1.2.3", "B")
               .create_verification(provider_version: "1.0.0")
@@ -239,10 +506,8 @@ module PactBroker
             ]
           end
 
-          subject { Repository.new.find(selectors) }
-
           it "returns the row for the version " do
-            expect(subject.first).to include provider_version_number: "2.0.0"
+            expect(subject).to include_hash_matching provider_version_number: "2.0.0"
             expect(subject.size).to eq 1
           end
         end
@@ -264,10 +529,8 @@ module PactBroker
             ]
           end
 
-          subject { Repository.new.find(selectors) }
-
           it "returns the row for the version " do
-            expect(subject.first).to include provider_version_number: "3.0.0"
+            expect(subject).to include_hash_matching provider_version_number: "3.0.0"
             expect(subject.size).to eq 1
           end
         end
@@ -286,8 +549,6 @@ module PactBroker
             ]
           end
 
-          subject { Repository.new.find(selectors) }
-
           it "returns no data - this may be confusing. Might need to re-think this logic." do
             expect(subject.size).to eq 0
           end
@@ -325,6 +586,8 @@ module PactBroker
       describe "#find_compatible_pacticipant_versions" do
         let(:td) { TestDataBuilder.new }
 
+        subject { Repository.new.find(selectors, success: [true], latestby: 'cvpv')}
+
         context "when compatible versions can be found" do
           before do
             td.create_pact_with_hierarchy("A", "1", "B")
@@ -345,34 +608,33 @@ module PactBroker
 
           let(:selectors){ build_selectors("A" => "1", "B" => "2", "C" => "2") }
 
-          subject { Repository.new.find_compatible_pacticipant_versions(selectors) }
-
           it "returns matrix lines for each compatible version pair (A/1-B/2, B/2-C/2)" do
-            expect(subject.first[:consumer_name]).to eq "A"
-            expect(subject.first[:consumer_version_number]).to eq "1"
-            expect(subject.first[:provider_name]).to eq "B"
-            expect(subject.first[:provider_version_number]).to eq "2"
-            expect(subject.first[:number]).to eq 2
-            expect(subject.first[:pact_created_at]).to be_datey
-            expect(subject.first[:verification_executed_at]).to be_datey
-
-            expect(subject.last[:consumer_name]).to eq "B"
-            expect(subject.last[:consumer_version_number]).to eq "2"
-            expect(subject.last[:provider_name]).to eq "C"
-            expect(subject.last[:provider_version_number]).to eq "2"
-            expect(subject.last[:number]).to eq 1
-            expect(subject.last[:pact_created_at]).to be_datey
+            expect(subject).to include_hash_matching(
+              consumer_name: "A",
+              consumer_version_number: "1",
+              provider_name: "B",
+              provider_version_number: "2",
+              verification_number: 2
+            )
+
+            expect(subject).to include_hash_matching(
+              consumer_name: "B",
+              consumer_version_number: "2",
+              provider_name: "C",
+              provider_version_number: "2",
+              verification_number: 1,
+            )
 
             expect(subject.size).to eq 2
           end
 
           context "when one or more pacticipants does not have a version specified" do
             let(:selectors){ build_selectors("A" => "1", "B" => "2", "C" => nil) }
-            subject { Repository.new.find_compatible_pacticipant_versions(selectors) }
+            let(:options) { { latestby: 'cvpv'} }
 
             it "returns all the rows for that pacticipant" do
-              expect(subject[1]).to include(provider_name: "C", provider_version_number: "2")
-              expect(subject[2]).to include(provider_name: "C", provider_version_number: "3")
+              expect(subject).to include_hash_matching(provider_name: "C", provider_version_number: "2")
+              expect(subject).to include_hash_matching(provider_name: "C", provider_version_number: "3")
               expect(subject.size).to eq 3
             end
           end
@@ -380,8 +642,6 @@ module PactBroker
           context "none of the pacticipants have a version specified" do
             let(:selectors){ build_selectors("A" => nil, "B" => nil, "C" => nil) }
 
-            subject { Repository.new.find_compatible_pacticipant_versions(selectors) }
-
             it "returns all the rows" do
               expect(subject.size).to eq 5
             end
@@ -401,11 +661,11 @@ module PactBroker
 
           it "returns the last line" do
             expect(subject.size).to eq 1
-            expect(subject.first[:number]).to eq 2
+            expect(subject).to include_hash_matching verification_number: 2
           end
         end
 
-        context "when there is more than one compatible verison pair and the last one is a failure" do
+        context "when there is more than one verification and the last one is a failure" do
           before do
             td.create_pact_with_hierarchy("X", "1", "Y")
               .create_verification(provider_version: "1")