pact_broker 2.77.0 → 2.80.0

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

@@ -1,4 +1,4 @@
-require 'pact_broker/pacts/repository'
+require "pact_broker/pacts/repository"
 
 module PactBroker
   module Pacts
@@ -218,6 +218,64 @@ module PactBroker
             expect(subject.size).to be 0
           end
         end
+
+        context "when the provider version tag specified does not exist yet and there are previous successful verifications from another branch" do
+          before do
+            td.create_pact_with_hierarchy("foo", "1", "bar")
+              .create_consumer_version_tag("main")
+              .create_verification(provider_version: "20", branch: "dev", success: true)
+              .create_verification(provider_version: "21", number: 2)
+          end
+
+          let(:provider_version_branch) { "feat-new-branch" }
+
+          it { is_expected.to be_empty }
+        end
+
+        context "when the provider version tag specified does not exist yet and there are previous failed verifications from another branch" do
+          before do
+            td.create_pact_with_hierarchy("foo", "1", "bar")
+              .create_consumer_version_tag("main")
+              .create_verification(provider_version: "20", branch: "dev", success: false)
+              .create_verification(provider_version: "21", number: 2)
+          end
+
+          let(:provider_version_branch) { "feat-new-branch" }
+
+          it "is included" do
+            expect(subject.first.provider_branch).to eq provider_version_branch
+          end
+        end
+
+        context "when there is a successful verification from before the first provider version with the specified tag was created" do
+          before do
+            td.create_pact_with_hierarchy("foo", "1", "bar")
+              .create_consumer_version_tag("main")
+              .create_verification(provider_version: "20", branch: "dev", success: true)
+              .add_day
+              .create_verification(provider_version: "21", branch: "feat-new-branch", number: 2, success: false)
+          end
+
+          let(:provider_version_branch) { "feat-new-branch" }
+
+          it { is_expected.to be_empty }
+        end
+
+        context "when there is a successful verification from after the first provider version with the specified tag was created" do
+          before do
+            td.create_pact_with_hierarchy("foo", "1", "bar")
+              .create_consumer_version_tag("main")
+              .create_verification(provider_version: "21", branch: "feat-new-branch", number: 2, success: false)
+              .add_day
+              .create_verification(provider_version: "20", branch: "dev", success: true)
+          end
+
+          let(:provider_version_branch) { "feat-new-branch" }
+
+          it "is included" do
+            expect(subject.first.provider_branch).to eq provider_version_branch
+          end
+        end
       end
     end
   end

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

@@ -1,4 +1,4 @@
-require 'pact_broker/pacts/repository'
+require "pact_broker/pacts/repository"
 
 module PactBroker
   module Pacts
@@ -253,24 +253,22 @@ module PactBroker
           end
         end
 
-        context "when the first provider tag with a given name was created after the head pact was created" do
+        context "when the provider tag does not exist yet and there are no provider versions" do
           before do
             td.create_pact_with_hierarchy("foo", "1", "bar")
               .create_consumer_version_tag("feat-x")
-              .add_day
-              .create_provider_version("5")
-              .create_provider_version_tag(provider_tags.first)
           end
 
-          it "doesn't return any pacts" do
-            expect(subject.size).to be 0
+          it "is included" do
+            expect(subject.size).to be 1
           end
         end
 
-        context "when the provider tag does not exist yet and there are no provider versions" do
+        context "when the provider tag does not exist yet but there are other provider versions" do
           before do
             td.create_pact_with_hierarchy("foo", "1", "bar")
               .create_consumer_version_tag("feat-x")
+              .create_provider_version("1")
           end
 
           it "is included" do
@@ -278,35 +276,96 @@ module PactBroker
           end
         end
 
-        context "when the provider tag does not exist yet but there are other provider versions" do
+        context "when a pact was already successfully verified by another branch before the first creation of one tag but not the other" do
+          let(:provider_tags) { %w[dev feat-1] }
+
           before do
             td.create_pact_with_hierarchy("foo", "1", "bar")
               .create_consumer_version_tag("feat-x")
-              .create_provider_version("1")
+              .add_day
+              .create_verification(provider_version: "1", success: false, number: 1, tag_names: %w[dev])
+              .add_day
+              .create_verification(provider_version: "2", success: true, number: 2, tag_names: %w[blah])
+              .add_day
+              .create_verification(provider_version: "3", success: false, number: 3, tag_names: %w[feat-1])
           end
 
-          it "doesn't return any pacts" do
-            expect(subject.size).to be 0
+          it "is wip for the first tag but not the second" do
+            expect(subject.first.pending_provider_tags).to eq %w[dev]
           end
         end
 
-
-        context "when a pact was published between the first creation date of two provider tags" do
+        context "when a pact was already successfully verified by another branch before the first creation of one tag but not the other" do
           let(:provider_tags) { %w[dev feat-1] }
 
           before do
-            td.create_provider("bar")
-              .create_provider_version("4")
-              .create_provider_version_tag(provider_tags.first)
-              .add_day
-              .create_pact_with_hierarchy("foo", "1", "bar")
+            td.create_pact_with_hierarchy("foo", "1", "bar")
               .create_consumer_version_tag("feat-x")
               .add_day
-              .create_provider_version("5")
-              .create_provider_version_tag(provider_tags.last)
+              .create_verification(provider_version: "1", success: true, number: 1, tag_names: %w[dev])
+              .add_day
+              .create_verification(provider_version: "3", success: false, number: 3, tag_names: %w[feat-1])
           end
 
-          it "is wip for the first tag but not the second" do
+          it "this should be WIP, as it hasn't been successfully verified by both dev AND feat-1 - need to update logic to exclude previous verifications from other specified tags. But two tags doesn't make sense anyway. Will leave it for now.", pending: true do
+            expect(subject).to_not be_empty
+          end
+        end
+
+        context "when the provider version tag specified does not exist yet and there are previous successful verifications from another branch" do
+          before do
+            td.create_pact_with_hierarchy("foo", "1", "bar")
+              .create_consumer_version_tag("main")
+              .create_verification(provider_version: "20", tag_names: ["dev"], success: true)
+              .create_verification(provider_version: "21", number: 2)
+          end
+
+          let(:provider_tags) { %w[feat-new-branch] }
+
+          it { is_expected.to be_empty }
+        end
+
+        context "when the provider version tag specified does not exist yet and there are previous failed verifications from another branch" do
+          before do
+            td.create_pact_with_hierarchy("foo", "1", "bar")
+              .create_consumer_version_tag("main")
+              .create_verification(provider_version: "20", tag_names: ["dev"], success: false)
+              .create_verification(provider_version: "21", number: 2)
+          end
+
+          let(:provider_tags) { %w[feat-new-branch] }
+
+          it "is included" do
+            expect(subject.first.pending_provider_tags).to eq [provider_tags.first]
+          end
+        end
+
+        context "when there is a successful verification from before the first provider version with the specified tag was created" do
+          before do
+            td.create_pact_with_hierarchy("foo", "1", "bar")
+              .create_consumer_version_tag("main")
+              .create_verification(provider_version: "20", tag_names: ["dev"], success: true)
+              .add_day
+              .create_verification(provider_version: "21", tag_names: ["feat-new-branch"], number: 2, success: false)
+          end
+
+          let(:provider_tags) { %w[feat-new-branch] }
+
+          it { is_expected.to be_empty }
+        end
+
+        context "when there is a successful verification from after the first provider version with the specified tag was created" do
+          before do
+            td.create_pact_with_hierarchy("foo", "1", "bar")
+              .create_consumer_version_tag("main")
+              .create_verification(provider_version: "21", tag_names: ["feat-new-branch"], number: 2, success: false)
+              .add_day
+              .create_verification(provider_version: "20", tag_names: ["dev"], success: true)
+          end
+
+          let(:provider_tags) { %w[feat-new-branch] }
+
+          it "is included" do
             expect(subject.first.pending_provider_tags).to eq [provider_tags.first]
           end
         end

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

@@ -1,23 +1,23 @@
 # Yes, I know this file is too bug, but cmd+shift+t is too useful!
 
-require 'pact_broker/pacts/repository'
-require 'pact_broker/pacts/pact_params'
-require 'pact_broker/versions/repository'
-require 'pact_broker/pacticipants/repository'
+require "pact_broker/pacts/repository"
+require "pact_broker/pacts/pact_params"
+require "pact_broker/versions/repository"
+require "pact_broker/pacticipants/repository"
 
 module PactBroker
   module Pacts
     describe Repository do
 
-      let(:consumer_name) { 'Consumer' }
-      let(:provider_name) { 'Provider' }
+      let(:consumer_name) { "Consumer" }
+      let(:provider_name) { "Provider" }
 
       describe "create" do
-        let(:consumer) { Pacticipants::Repository.new.create name: 'Consumer' }
-        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(:consumer) { Pacticipants::Repository.new.create name: "Consumer" }
+        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(:params) do
           {
@@ -47,8 +47,8 @@ module PactBroker
         it "sets all the Pact::Model attributes" do
           expect(subject.consumer).to eq consumer
           expect(subject.provider).to eq provider
-          expect(subject.consumer_version_number).to eq '1.2.3'
-          expect(subject.consumer_version.number).to eq '1.2.3'
+          expect(subject.consumer_version_number).to eq "1.2.3"
+          expect(subject.consumer_version.number).to eq "1.2.3"
           expect(subject.json_content).to eq json_content
           expect(subject.created_at).to be_datey
         end
@@ -63,7 +63,7 @@ module PactBroker
         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 }
+          let(:another_version) { Versions::Repository.new.create number: "2.0.0", pacticipant_id: consumer.id }
 
           before do
             Repository.new.create(
@@ -111,9 +111,9 @@ module PactBroker
         end
 
         context "when base_equality_only_on_content_that_affects_verification_results is true" do
-          let(:another_version) { Versions::Repository.new.create number: '2.0.0', pacticipant_id: consumer.id }
-          let(:sha_1) { '1' }
-          let(:sha_2) { '1' }
+          let(:another_version) { Versions::Repository.new.create number: "2.0.0", pacticipant_id: consumer.id }
+          let(:sha_1) { "1" }
+          let(:sha_2) { "1" }
 
           before do
             # PactBroker.configuration.base_equality_only_on_content_that_affects_verification_results = true
@@ -144,7 +144,7 @@ module PactBroker
           end
 
           context "when the sha is not the same" do
-            let(:sha_2) { '2' }
+            let(:sha_2) { "2" }
 
             it "creates a new PactVersion" do
               expect { subject }.to change{ PactVersion.count }.by(1)
@@ -153,8 +153,8 @@ module PactBroker
         end
 
         context "when a pact already exists with the same content but with a different consumer/provider" do
-          let(:another_version) { Versions::Repository.new.create number: '2.0.0', pacticipant_id: consumer.id }
-          let(:another_provider) { Pacticipants::Repository.new.create name: 'Provider2' }
+          let(:another_version) { Versions::Repository.new.create number: "2.0.0", pacticipant_id: consumer.id }
+          let(:another_provider) { Pacticipants::Repository.new.create name: "Provider2" }
           before do
             Repository.new.create(
               version_id: version.id,
@@ -181,14 +181,14 @@ module PactBroker
         end
 
         context "when a pact already exists with different content" do
-          let(:another_version) { Versions::Repository.new.create number: '2.0.0', pacticipant_id: consumer.id }
+          let(:another_version) { Versions::Repository.new.create number: "2.0.0", pacticipant_id: consumer.id }
 
           before do
             Repository.new.create(
               version_id: version.id,
               consumer_id: consumer.id,
               provider_id: provider.id,
-              json_content: {some_other: 'json_content'}.to_json,
+              json_content: {some_other: "json_content"}.to_json,
               pact_version_sha: pact_version_sha
             )
           end
@@ -232,10 +232,10 @@ module PactBroker
 
         let(:created_at) { DateTime.new(2014, 3, 2) }
 
-        let(:original_json_content) { {some: 'json'}.to_json }
-        let(:json_content) { {some_other: 'json'}.to_json }
-        let(:pact_version_sha) { '123' }
-        let(:new_pact_version_sha) { '567' }
+        let(:original_json_content) { {some: "json"}.to_json }
+        let(:json_content) { {some_other: "json"}.to_json }
+        let(:pact_version_sha) { "123" }
+        let(:new_pact_version_sha) { "567" }
 
         context "when the pact_version_sha has changed" do
           subject { repository.update(existing_pact.id, json_content: json_content, pact_version_sha: new_pact_version_sha) }
@@ -325,7 +325,7 @@ module PactBroker
             .create_pact
         end
 
-        let(:pact_params) { PactBroker::Pacts::PactParams.new(consumer_name: consumer_name, provider_name: provider_name, consumer_version_number: '1.2.3') }
+        let(:pact_params) { PactBroker::Pacts::PactParams.new(consumer_name: consumer_name, provider_name: provider_name, consumer_version_number: "1.2.3") }
 
         subject { Repository.new.delete pact_params }
 
@@ -807,18 +807,18 @@ module PactBroker
 
       describe "find_previous_distinct_pact" do
 
-        let(:pact_content_version_1) { load_fixture('consumer-provider.json') }
+        let(:pact_content_version_1) { load_fixture("consumer-provider.json") }
         let(:pact_content_version_2) do
-          hash = load_json_fixture('consumer-provider.json')
-          hash['interactions'].first['foo'] = 'bar' # Extra key in interactions will affect equality
+          hash = load_json_fixture("consumer-provider.json")
+          hash["interactions"].first["foo"] = "bar" # Extra key in interactions will affect equality
           hash.to_json
         end
-        let(:pact_content_version_3) {  load_fixture('consumer-provider.json') }
+        let(:pact_content_version_3) {  load_fixture("consumer-provider.json") }
         let(:pact_content_version_4) do
           # Move description to end of hash, should not affect equality
-          hash = load_json_fixture('consumer-provider.json')
-          description = hash['interactions'].first.delete('description')
-          hash['interactions'].first['description'] = description
+          hash = load_json_fixture("consumer-provider.json")
+          description = hash["interactions"].first.delete("description")
+          hash["interactions"].first["description"] = description
           hash.to_json
         end
 
@@ -851,7 +851,7 @@ module PactBroker
         end
 
         context "when there isn't a previous distinct version" do
-          let(:pact_content_version_2) { load_fixture('consumer-provider.json') }
+          let(:pact_content_version_2) { load_fixture("consumer-provider.json") }
 
           it "returns nil" do
             expect(subject).to be nil
@@ -983,19 +983,19 @@ module PactBroker
         before do
           TestDataBuilder.new
             .create_consumer("Condor")
-            .create_consumer_version('1.3.0')
+            .create_consumer_version("1.3.0")
             .create_provider("Pricing Service")
             .create_pact
-            .create_consumer_version('1.4.0')
+            .create_consumer_version("1.4.0")
             .create_consumer_version_tag("prod")
             .create_pact
             .create_consumer("Contract Email Service")
             .create_consumer_version("2.6.0")
             .create_provider("Contract Proposal Service")
             .create_pact
-            .create_consumer_version('2.7.0')
+            .create_consumer_version("2.7.0")
             .create_pact
-            .create_consumer_version('2.8.0') # Create a version without a pact, it shouldn't be used
+            .create_consumer_version("2.8.0") # Create a version without a pact, it shouldn't be used
         end
 
         it "finds the latest pact for each consumer/provider pair" do

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

@@ -1,4 +1,4 @@
-require 'pact_broker/pacts/selected_pact'
+require "pact_broker/pacts/selected_pact"
 
 module PactBroker
   module Pacts

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

@@ -1,4 +1,4 @@
-require 'pact_broker/pacts/selector'
+require "pact_broker/pacts/selector"
 
 module PactBroker
   module Pacts
@@ -6,21 +6,24 @@ module PactBroker
       describe "<=>" do
         let(:overall_latest_1) { Selector.overall_latest }
         let(:overall_latest_2) { Selector.overall_latest }
-        let(:latest_for_branch_main) { Selector.latest_for_branch('main') }
-        let(:latest_for_tag_prod) { Selector.latest_for_tag('prod') }
-        let(:latest_for_tag_dev) { Selector.latest_for_tag('dev') }
-        let(:all_prod_for_consumer_1) { Selector.all_for_tag_and_consumer('prod', 'Foo') }
-        let(:all_prod_for_consumer_2) { Selector.all_for_tag_and_consumer('prod', 'Bar') }
-        let(:all_dev_for_consumer_1) { Selector.all_for_tag_and_consumer('dev', 'Bar') }
-        let(:all_prod) { Selector.all_for_tag('prod') }
-        let(:all_dev) { Selector.all_for_tag('dev') }
+        let(:latest_for_branch_main) { Selector.latest_for_branch("main") }
+        let(:latest_for_tag_prod) { Selector.latest_for_tag("prod") }
+        let(:latest_for_tag_dev) { Selector.latest_for_tag("dev") }
+        let(:all_prod_for_consumer_1) { Selector.all_for_tag_and_consumer("prod", "Foo") }
+        let(:all_prod_for_consumer_2) { Selector.all_for_tag_and_consumer("prod", "Bar") }
+        let(:all_dev_for_consumer_1) { Selector.all_for_tag_and_consumer("dev", "Bar") }
+        let(:all_prod) { Selector.all_for_tag("prod") }
+        let(:all_dev) { Selector.all_for_tag("dev") }
+        let(:currently_deployed_to_prod) { Selector.for_currently_deployed("prod") }
+        let(:currently_deployed_to_test) { Selector.for_currently_deployed("test") }
+        let(:currently_supported_in_prod) { Selector.for_currently_supported("prod") }
 
         let(:unsorted_selectors) do
-          [all_prod, all_dev, all_dev_for_consumer_1, latest_for_branch_main, latest_for_tag_prod, overall_latest_1, overall_latest_1, latest_for_tag_dev, all_prod_for_consumer_2, all_prod_for_consumer_1]
+          [currently_supported_in_prod, all_prod, all_dev, currently_deployed_to_prod, all_dev_for_consumer_1, latest_for_branch_main, latest_for_tag_prod, currently_deployed_to_test, overall_latest_1, overall_latest_1, latest_for_tag_dev, all_prod_for_consumer_2, all_prod_for_consumer_1]
         end
 
         let(:expected_sorted_selectors) do
-          [overall_latest_1, overall_latest_1, latest_for_branch_main, latest_for_tag_dev, latest_for_tag_prod, all_dev_for_consumer_1, all_prod_for_consumer_2, all_prod_for_consumer_1, all_dev, all_prod]
+          [overall_latest_1, overall_latest_1, latest_for_branch_main, currently_deployed_to_prod, currently_deployed_to_test, currently_supported_in_prod, latest_for_tag_dev, latest_for_tag_prod, all_dev_for_consumer_1, all_prod_for_consumer_2, all_prod_for_consumer_1, all_dev, all_prod]
         end
 
         it "sorts the selectors" do

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

@@ -1,11 +1,11 @@
-require 'pact_broker/pacts/selectors'
-require 'pact_broker/pacts/selector'
+require "pact_broker/pacts/selectors"
+require "pact_broker/pacts/selector"
 
 module PactBroker
   module Pacts
     describe Selectors do
       let(:selector_1) { Selector.overall_latest }
-      let(:selector_2) { Selector.latest_for_tag('dev') }
+      let(:selector_2) { Selector.latest_for_tag("dev") }
       let(:selectors_1) { Selectors.new([selector_1]) }
       let(:selectors_2) { Selectors.new([selector_2]) }
       let(:selectors_array) { [selectors_1, selectors_2] }