pact_broker 2.77.0 → 2.80.0

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

@@ -1,4 +1,4 @@
-require 'pact_broker/matrix/row'
+require "pact_broker/matrix/row"
 
 module PactBroker
   module Matrix
@@ -29,20 +29,20 @@ module PactBroker
       describe "<=>" do
         let(:row_1) do
           Row.new(
-            consumer_name: 'A',
+            consumer_name: "A",
             consumer_version_order: 1,
             pact_revision_number: 1,
-            provider_name: 'B',
+            provider_name: "B",
             provider_version_order: 1,
             verification_id: 1
           )
         end
         let(:row_2) do
           Row.new(
-            consumer_name: 'A',
+            consumer_name: "A",
             consumer_version_order: 1,
             pact_revision_number: 1,
-            provider_name: 'B',
+            provider_name: "B",
             provider_version_order: 1,
             verification_id: 2
           )
@@ -55,10 +55,10 @@ module PactBroker
         context "with a nil column" do
           let(:row_2) do
             Row.new(
-              consumer_name: 'A',
+              consumer_name: "A",
               consumer_version_order: 1,
               pact_revision_number: 1,
-              provider_name: 'B',
+              provider_name: "B",
               provider_version_order: nil,
               verification_id: nil
             )

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

@@ -1,14 +1,18 @@
-require 'pact_broker/matrix/service'
-require 'pact_broker/matrix/unresolved_selector'
+require "pact_broker/matrix/service"
+require "pact_broker/matrix/unresolved_selector"
 
 module PactBroker
   module Matrix
     describe Service do
-      let(:td) { TestDataBuilder.new }
-
       describe "validate_selectors" do
+        before do
+          allow(PactBroker::Deployments::EnvironmentService).to receive(:find_by_name).and_return(environment)
+        end
+        let(:environment) { double("environment") }
+
+        subject { Service.validate_selectors(selectors, options) }
 
-        subject { Service.validate_selectors(selectors) }
+        let(:options) { {} }
 
         context "when there are no selectors" do
           let(:selectors) { [] }
@@ -82,16 +86,75 @@ module PactBroker
             expect(subject).to eq ["A version number and latest flag cannot both be specified for Foo"]
           end
         end
+
+        context "when both a to tag and an environment are specified" do
+          let(:selectors) { [] }
+
+          let(:options) do
+            {
+              tag: "prod",
+              environment_name: "prod"
+            }
+          end
+
+          it "returns an error message" do
+            expect(subject.last).to include "Cannot specify both"
+          end
+        end
+
+        context "when both latest=true and an environment are specified" do
+          let(:selectors) { [] }
+
+          let(:options) do
+            {
+              latest: true,
+              environment_name: "prod"
+            }
+          end
+
+          it "returns an error message" do
+            expect(subject.last).to include "Cannot specify both latest"
+          end
+        end
+
+        context "when the environment does not exist" do
+          let(:selectors) { [] }
+          let(:environment) { nil }
+
+          let(:options) do
+            {
+              environment_name: "prod"
+            }
+          end
+
+          it "returns an error message" do
+            expect(subject.last).to include "Environment with name 'prod' does not exist"
+          end
+        end
+
+        context "when a pacticipant to ignore is missing a name" do
+          let(:selectors) { [UnresolvedSelector.new(pacticipant_name: "Foo", pacticipant_version_number: "1")] }
+
+          let(:options) do
+            {
+              ignore_selectors: [UnresolvedSelector.new(pacticipant_version_number: "1")]
+            }
+          end
+
+          it "returns an error message" do
+            expect(subject.last).to include "Please specify the pacticipant name to ignore"
+          end
+        end
       end
 
       describe "find_for_consumer_and_provider_with_tags integration test" do
 
         let(:params) do
           {
-            consumer_name: 'consumer',
-            provider_name: 'provider',
-            tag: 'prod',
-            provider_tag: 'master'
+            consumer_name: "consumer",
+            provider_name: "provider",
+            tag: "prod",
+            provider_tag: "master"
           }
         end
 
@@ -99,21 +162,21 @@ module PactBroker
 
         context "when the specified row exists" do
           before do
-            td.create_pact_with_hierarchy('consumer', '1', 'provider')
-              .create_consumer_version_tag('prod')
-              .create_verification(provider_version: '2')
-              .use_provider_version('2')
-              .create_provider_version_tag('master')
-              .create_verification(provider_version: '3', number: 2)
-              .create_consumer_version('2')
+            td.create_pact_with_hierarchy("consumer", "1", "provider")
+              .create_consumer_version_tag("prod")
+              .create_verification(provider_version: "2")
+              .use_provider_version("2")
+              .create_provider_version_tag("master")
+              .create_verification(provider_version: "3", number: 2)
+              .create_consumer_version("2")
               .create_pact
           end
 
           it "returns the row" do
-            expect(subject.consumer_name).to eq 'consumer'
-            expect(subject.provider_name).to eq 'provider'
-            expect(subject.consumer_version_number).to eq '1'
-            expect(subject.provider_version_number).to eq '2'
+            expect(subject.consumer_name).to eq "consumer"
+            expect(subject.provider_name).to eq "provider"
+            expect(subject.consumer_version_number).to eq "1"
+            expect(subject.provider_version_number).to eq "2"
           end
         end
 

data/spec/lib/pact_broker/messages_spec.rb

@@ -1,12 +1,12 @@
-require 'spec_helper'
-require 'pact_broker/messages'
+require "spec_helper"
+require "pact_broker/messages"
 
 module PactBroker
   module Messages
     describe "#potential_duplicate_pacticipant_message" do
-      let(:new_name) { 'Contracts' }
-      let(:fred) { double('Contracts Service', name: 'Contracts Service') }
-      let(:frederich) { double('Accepted Contracts', name: 'Accepted Contracts') }
+      let(:new_name) { "Contracts" }
+      let(:fred) { double("Contracts Service", name: "Contracts Service") }
+      let(:frederich) { double("Accepted Contracts", name: "Accepted Contracts") }
       let(:potential_duplicate_pacticipants) { [fred, frederich]}
 
       let(:expected_message) { String.new <<-EOS
@@ -19,7 +19,7 @@ If the pact is intended to be for a new consumer or provider, please manually cr
 $ curl -v -XPOST -H "Content-Type: application/json" -d "{\\\"name\\\": \\\"Contracts\\\"}" http://example.org/pacticipants
 EOS
       }
-      subject { Messages.potential_duplicate_pacticipant_message new_name, potential_duplicate_pacticipants, 'http://example.org' }
+      subject { Messages.potential_duplicate_pacticipant_message new_name, potential_duplicate_pacticipants, "http://example.org" }
 
       it "returns a message" do
         expect(subject).to start_with expected_message

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

@@ -1,4 +1,4 @@
-require 'pact_broker/metrics/service'
+require "pact_broker/metrics/service"
 
 module PactBroker
   module Metrics

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

@@ -1,5 +1,5 @@
-require 'spec_helper'
-require 'pact_broker/pacticipants/find_potential_duplicate_pacticipant_names'
+require "spec_helper"
+require "pact_broker/pacticipants/find_potential_duplicate_pacticipant_names"
 
 module PactBroker
 
@@ -36,14 +36,14 @@ module PactBroker
           ["The Accounts", ["Accounts"], []],
           ["accounts", ["account-service", "account-api", "account-provider"], ["account-service", "account-api", "account-provider"]],
           ["accounts-api", ["account-service", "account-provider"], ["account-service", "account-provider"]],
-          ['Contracts Service', ['Contracts Service', 'Contracts', 'Something'], []],
-          ['Contracts', ['Contract Service', 'Contacts', 'Something'], ['Contract Service']],
-          ['Contracts Service', ['Contract', 'Contacts', 'Something'], ['Contract']],
-          ['Contract Service', ['Contracts', 'Contacts', 'Something'], ['Contracts']],
-          ['Contract Service', ['contracts', 'Contacts', 'Something'], ['contracts']],
-          ['ContractService', ['Contracts Service', 'Contacts', 'Something'], ['Contracts Service']],
-          ['Contract Service', ['ContractsService', 'Contacts', 'Something'], ['ContractsService']],
-          ['Contract_Service', ['ContractsService', 'Contracts Service', 'contracts-service', 'Contacts', 'Something'], ['ContractsService', 'Contracts Service', 'contracts-service']]
+          ["Contracts Service", ["Contracts Service", "Contracts", "Something"], []],
+          ["Contracts", ["Contract Service", "Contacts", "Something"], ["Contract Service"]],
+          ["Contracts Service", ["Contract", "Contacts", "Something"], ["Contract"]],
+          ["Contract Service", ["Contracts", "Contacts", "Something"], ["Contracts"]],
+          ["Contract Service", ["contracts", "Contacts", "Something"], ["contracts"]],
+          ["ContractService", ["Contracts Service", "Contacts", "Something"], ["Contracts Service"]],
+          ["Contract Service", ["ContractsService", "Contacts", "Something"], ["ContractsService"]],
+          ["Contract_Service", ["ContractsService", "Contracts Service", "contracts-service", "Contacts", "Something"], ["ContractsService", "Contracts Service", "contracts-service"]]
         ]
 
         CALL_TEST_CASES.each do | the_new_name, the_existing_names, the_expected_duplicates |

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

@@ -0,0 +1,39 @@
+require "pact_broker/pacticipants/generate_display_name"
+
+module PactBroker
+  module Pacticipants
+    describe GenerateDisplayName do
+      describe ".call" do
+        TEST_CASES = {
+          "foo" => "Foo",
+          "MyService" => "My Service",
+          "my-service" => "My Service",
+          "my_service" => "My Service",
+          "my service" => "My Service",
+          "ABCService" => "ABC Service",
+          "A4Service" => "A4 Service",
+          "SNSPactEventConsumer" => "SNS Pact Event Consumer",
+          "AWSSummiteerWeb" => "AWS Summiteer Web",
+          "Beer-Consumer" => "Beer Consumer",
+          "foo.pretend-consumer" => "Foo Pretend Consumer",
+          "Client-XX" => "Client XX",
+          "providerJSWorkshop" => "Provider JS Workshop",
+          "e2e Provider Example" => "E2e Provider Example",
+          "MP - Our Provider" => "MP - Our Provider",
+          "PoC - Pact-broker-consumer" => "PoC - Pact Broker Consumer",
+          "QB-DATABASE Service" => "QB DATABASE Service",
+          "Support Species App (Provider)" => "Support Species App (Provider)",
+          9 => "9",
+          "" => "",
+          nil => nil
+        }
+
+        TEST_CASES.each do | name, expected_display_name |
+          it "converts #{name.inspect} to #{expected_display_name.inspect}" do
+            expect(GenerateDisplayName.call(name)).to eq expected_display_name
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
-require 'spec_helper'
-require 'pact_broker/pacticipants/repository'
-require 'support/test_data_builder'
+require "spec_helper"
+require "pact_broker/pacticipants/repository"
+require "support/test_data_builder"
 
 module PactBroker
   module Pacticipants
@@ -12,20 +12,34 @@ module PactBroker
 
         context "when the pacticipant does not already exist" do
           before do
-            TestDataBuilder.new.create_pacticipant("Bar")
+            td.create_pacticipant("Bar")
+            allow_any_instance_of(PactBroker::Domain::Pacticipant).to receive(:generate_display_name).and_return("display_name")
           end
 
-          subject { repository.create(name: "Foo") }
+          let(:display_name) { "Foo" }
+
+          subject { repository.create(name: "foo", display_name: display_name, repository_url: "url", main_branch: "main") }
 
           it "returns the new pacticipant" do
             expect(subject).to be_a(PactBroker::Domain::Pacticipant)
-            expect(subject.name).to eq "Foo"
+            expect(subject.name).to eq "foo"
+            expect(subject.main_branch).to eq "main"
+            expect(subject.repository_url).to eq "url"
+            expect(subject.display_name).to eq "Foo"
+          end
+
+          context "when no display name is provided" do
+            let(:display_name) { nil }
+
+            it "generates one" do
+              expect(subject.display_name).to eq "display_name"
+            end
           end
         end
 
         context "when a race condition occurs and the pacticipant was already created by another request" do
           before do
-            TestDataBuilder.new.create_pacticipant("Foo")
+            td.create_pacticipant("Foo", repository_url: "original")
           end
 
           it "does not raise an error" do
@@ -35,13 +49,29 @@ module PactBroker
           it "returns the existing pacticipant" do
             expect(subject).to be_a(PactBroker::Domain::Pacticipant)
             expect(subject.name).to eq "Foo"
+            expect(subject.repository_url).to eq "original"
           end
         end
       end
 
+      describe "replace" do
+        before do
+          td.create_pacticipant("Bar", main_branch: "foo", repository_namespace: "foo")
+          allow_any_instance_of(PactBroker::Domain::Pacticipant).to receive(:generate_display_name).and_return("display_name")
+        end
+
+        subject { Repository.new.replace("Bar", OpenStruct.new(main_branch: "bar", repository_url: "new_url")) }
+
+        it "replaces the pacticipant" do
+          expect(subject.main_branch).to eq "bar"
+          expect(subject.repository_namespace).to eq nil
+          expect(subject.display_name).to eq "display_name"
+        end
+      end
+
       describe "#find" do
         before do
-          TestDataBuilder.new
+          td
             .create_pacticipant("Foo")
             .create_label("in")
             .create_pacticipant("Bar")
@@ -63,7 +93,7 @@ module PactBroker
           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
@@ -104,19 +134,19 @@ module PactBroker
               allow(PactBroker.configuration).to receive(:use_case_sensitive_resource_names).and_return(false)
             end
 
-            subject { Repository.new.find_by_name('foo_bar') }
+            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') }
+            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') }
+            subject { Repository.new.find_by_name("blah") }
 
             it { is_expected.to be nil }
           end
@@ -124,9 +154,8 @@ module PactBroker
       end
 
       describe "#pacticipant_names" do
-
         before do
-          TestDataBuilder.new
+          td
             .create_pacticipant("Plants")
             .create_pacticipant("Animals")
         end
@@ -141,7 +170,7 @@ module PactBroker
 
       describe "#find_all_pacticipant_versions_in_reverse_order" do
         before do
-          TestDataBuilder.new
+          td
             .create_consumer("Foo")
             .create_consumer_version("1.2.3")
             .create_consumer_version("4.5.6")
@@ -163,6 +192,48 @@ module PactBroker
           end
         end
       end
+
+      describe "#search_by_name" do
+        let(:consumer_name) { "This is_a test-consumer" }
+        let(:provider_name) { "and a test/provider" }
+
+        before do
+          td
+            .create_consumer(consumer_name)
+            .create_consumer(provider_name)
+        end
+
+        context "when there is a consumer/provider name which matches the search term" do
+          it "returns the pacticipants" do
+            searched_dataset =  Repository.new.search_by_name "consumer"
+            expect(searched_dataset.collect(&:name)).to eq([consumer_name])
+
+            searched_dataset =  Repository.new.search_by_name "provider"
+            expect(searched_dataset.collect(&:name)).to eq([provider_name])
+
+            searched_dataset =  Repository.new.search_by_name "test"
+            expect(searched_dataset.collect(&:name)).to include(*[consumer_name, provider_name])
+          end
+
+          # SQL escape character is '_'
+          it "escapes the '_' character" do
+            searched_dataset =  Repository.new.search_by_name "is_a"
+            expect(searched_dataset.collect(&:name)).to eq([consumer_name])
+          end
+
+          it "searches case insentively" do
+            searched_dataset =  Repository.new.search_by_name "TEST"
+            expect(searched_dataset.collect(&:name)).to include(*[consumer_name, provider_name])
+          end
+        end
+
+        context "when there is NO consumer/provider name which matches the search term" do
+          it "returns empty dataset" do
+            searched_dataset =  Repository.new.search_by_name "this_will_not_yield_any_result"
+            expect(searched_dataset.count).to eq(0)
+          end
+        end
+      end
     end
   end
 end