pact_broker 2.75.0 → 2.78.0

data/spec/features/update_environment_spec.rb

@@ -0,0 +1,44 @@
+require 'pact_broker/api/pact_broker_urls'
+
+describe "Updating an environment" do
+  before do
+    td.create_environment("test", uuid: "1234", contacts: [ { name: "Foo" } ] )
+  end
+  let(:path) { PactBroker::Api::PactBrokerUrls.environment_url(td.and_return(:environment)) }
+  let(:headers) { {'CONTENT_TYPE' => 'application/json'} }
+  let(:response_body) { JSON.parse(last_response.body, symbolize_names: true)}
+  let(:environment_hash) do
+    {
+      name: "test",
+      production: false,
+      displayName: "Testing"
+    }
+  end
+
+  subject { put(path, environment_hash.to_json, headers) }
+
+  it { is_expected.to be_a_hal_json_success_response }
+
+  it "returns the updated environment" do
+    subject
+    expect(response_body[:displayName]).to eq "Testing"
+    expect(response_body[:contacts]).to be nil
+  end
+
+  context "when the environment doesn't exist" do
+    let(:path) { "/environments/5678" }
+
+    it "returns a 404" do
+      expect(subject.status).to eq 404
+    end
+  end
+
+  context "with invalid params" do
+    let(:environment_hash) { {} }
+
+    it "returns a 400 response" do
+      expect(subject.status).to be 400
+      expect(response_body[:errors]).to_not be nil
+    end
+  end
+end

data/spec/fixtures/approvals/modifiable_resources.approved.json

@@ -6,6 +6,12 @@
     {
       "resource_class_name": "PactBroker::Api::Resources::Clean"
     },
+    {
+      "resource_class_name": "PactBroker::Api::Resources::Environment"
+    },
+    {
+      "resource_class_name": "PactBroker::Api::Resources::Environments"
+    },
     {
       "resource_class_name": "PactBroker::Api::Resources::ErrorTest"
     },

data/spec/fixtures/dashboard.json

@@ -20,7 +20,8 @@
               "href": "consumer_version_url"
             }
           },
-          "number": "1"
+          "number": "1",
+          "branch": "main"
         }
       },
       "latestVerificationResult": {
@@ -73,7 +74,8 @@
         },
         "name": "Bar",
         "version": {
-          "number": "2"
+          "number": "2",
+          "branch": "main"
         }
       },
       "verificationStatus": "wiffle",

data/spec/integration/ui/index_spec.rb

@@ -14,7 +14,9 @@ describe "UI index" do
     get "/"
   end
 
-  subject { get("/", params, {}); last_response }
+  let(:rack_env) { {} }
+
+  subject { get("/", params, rack_env) }
 
   describe "GET" do
     it "returns a success response" do
@@ -40,9 +42,7 @@ describe "UI index" do
     end
 
     context "with the base_url set" do
-      before do
-        allow(PactBroker.configuration).to receive(:base_url).and_return('http://example.org/pact-broker')
-      end
+      let(:rack_env) { { "pactbroker.base_url" => "http://example.org/pact-broker"} }
 
       it "returns absolute links" do
         expect(subject.body).to include "href='http://example.org/pact-broker/stylesheets"

data/spec/lib/pact_broker/api/contracts/environment_schema_spec.rb

@@ -0,0 +1,83 @@
+require 'pact_broker/api/contracts/environment_schema'
+
+module PactBroker
+  module Api
+    module Contracts
+      describe EnvironmentSchema do
+        before do
+          allow(PactBroker::Deployments::EnvironmentService).to receive(:find_by_name).and_return(existing_environment)
+        end
+        let(:existing_environment) { nil }
+        let(:name) { "test" }
+
+        let(:params) do
+          {
+            uuid: "1234",
+            name: name,
+            displayName: "Test",
+            production: false,
+            contacts: contacts
+          }
+        end
+
+        let(:contacts) do
+          [{
+            name: "Foo",
+            details: { email: "foo@bar.com" }
+          }]
+        end
+
+        subject { EnvironmentSchema.call(params) }
+
+        context "with valid params" do
+          it { is_expected.to be_empty }
+        end
+
+        context "with a name with a new line" do
+          let(:name) { "test 1" }
+
+          it { is_expected.to_not be_empty }
+        end
+
+        context "with empty params" do
+          let(:params) { {} }
+
+          it { is_expected.to_not be_empty }
+        end
+
+        context "when there is another environment with the same name but a different uuid" do
+          let(:existing_environment) { instance_double("PactBroker::Deployments::Environment", uuid: "5678")}
+
+          its([:name]) { is_expected.to eq ["Another environment with name 'test' already exists."] }
+        end
+
+        context "when there is another environment with the same name and same uuid" do
+          let(:existing_environment) { instance_double("PactBroker::Deployments::Environment", uuid: "1234")}
+
+          it { is_expected.to be_empty }
+        end
+
+        context "with no owner name" do
+          let(:contacts) do
+            [{
+              details: { email: "foo@bar.com" }
+            }]
+          end
+
+          its([:contacts, 0]) { is_expected.to eq "name is missing at index 0" }
+        end
+
+        context "with string contact details" do
+          let(:contacts) do
+            [{
+              name: "foo",
+              details: "foo"
+            }]
+          end
+
+          its([:contacts, 0]) { is_expected.to eq "details must be a hash at index 0" }
+        end
+      end
+    end
+  end
+end

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

@@ -21,7 +21,9 @@ module PactBroker
             webhook_status: 'blah',
             pseudo_branch_verification_status: 'wiffle',
             provider_version_number: provider_version.number,
+            provider_version_branch: provider_version.branch,
             consumer_version_number: consumer_version.number,
+            consumer_version_branch: consumer_version.branch,
             tag_names: ['prod'],
             latest_verification_latest_tags: [double('tag', name: 'dev', latest?: true)]
           )
@@ -30,8 +32,8 @@ module PactBroker
         let(:provider) { instance_double('PactBroker::Domain::Pacticipant', name: 'Bar') }
         let(:pact) { instance_double('PactBroker::Domain::Pact', created_at: created_at) }
         let(:verification) { instance_double('PactBroker::Domain::Verification', success: true, created_at: created_at) }
-        let(:consumer_version) { instance_double('PactBroker::Domain::Version', number: '1', pacticipant: consumer) }
-        let(:provider_version) { instance_double('PactBroker::Domain::Version', number: '2', pacticipant: provider) }
+        let(:consumer_version) { instance_double('PactBroker::Domain::Version', number: '1', pacticipant: consumer, branch: "main") }
+        let(:provider_version) { instance_double('PactBroker::Domain::Version', number: '2', pacticipant: provider, branch: "main") }
         let(:last_webhook_execution_date) { created_at }
         let(:base_url) { 'http://example.org' }
         let(:options) { { user_options: { base_url: base_url } } }

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

@@ -1,6 +1,7 @@
 require 'pact_broker/api/decorators/matrix_decorator'
 require 'pact_broker/matrix/query_results_with_deployment_status_summary'
 require 'pact_broker/matrix/deployment_status_summary'
+require 'pact_broker/matrix/quick_row'
 
 module PactBroker
   module Api
@@ -12,37 +13,39 @@ module PactBroker
           let(:row_1_success) { true }
           let(:row_2_success) { true }
           let(:row_1) do
-            double('PactBroker::Matrix::Row',
+            instance_double('PactBroker::Matrix::QuickRow',
               {
                 consumer_name: "Consumer",
                 consumer_version_number: "1.0.0",
+                consumer_version_branch: "main",
                 consumer_version_tags: consumer_version_tags,
                 provider_version_tags: provider_version_tags,
                 pact_version_sha: "1234",
                 pact_created_at: pact_created_at,
                 provider_version_number: "4.5.6",
+                provider_version_branch: "feat/x",
                 provider_name: "Provider",
                 success: row_1_success,
                 verification_number: 1,
-                verification_build_url: nil,
                 verification_executed_at: verification_date
               }
             )
           end
 
           let(:row_2) do
-            double('PactBroker::Matrix::Row',
+            instance_double('PactBroker::Matrix::QuickRow',
               {
                 consumer_name: "Consumer",
                 consumer_version_number: "1.0.0",
+                consumer_version_branch: "main",
                 consumer_version_tags: [],
                 pact_version_sha: "1234",
                 pact_created_at: pact_created_at,
                 provider_version_number: nil,
+                provider_version_branch: nil,
                 provider_name: "Provider",
                 success: row_2_success,
                 verification_number: nil,
-                verification_build_url: nil,
                 verification_executed_at: verification_date
               }
             )
@@ -58,6 +61,7 @@ module PactBroker
               },
               version: {
                 number: '1.0.0',
+                branch: 'main',
                 _links: {
                   self: {
                     href: 'http://example.org/pacticipants/Consumer/versions/1.0.0'
@@ -88,6 +92,7 @@ module PactBroker
               },
               version: {
                 number: '4.5.6',
+                branch: 'feat/x',
                 _links: {
                   self: {
                     href: 'http://example.org/pacticipants/Provider/versions/4.5.6'
@@ -135,7 +140,7 @@ module PactBroker
 
           let(:consumer_version_tags) do
             [
-              double("tag", name: "prod", latest?: true, version: consumer_version)
+              double("tag", name: "prod", latest?: true, version: consumer_version, created_at: DateTime.now )
             ]
           end
 
@@ -143,7 +148,7 @@ module PactBroker
 
           let(:provider_version_tags) do
             [
-              double("tag", name: "master", latest?: false, version: provider_version)
+              double("tag", name: "master", latest?: false, version: provider_version, created_at: DateTime.now)
             ]
           end
 

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

@@ -5,17 +5,17 @@ module PactBroker
   module Api
     module Decorators
       describe ReasonDecorator do
-
-        REASON_CLASSES = ObjectSpace.each_object(Class).select { |klass| klass < PactBroker::Matrix::Reason }
+        REASON_CLASSES = ObjectSpace.each_object(Class).select { |klass| klass < PactBroker::Matrix::Reason && klass.name&.start_with?("PactBroker") }
 
         describe "the number of Reason classes" do
-          it "is 9 - add another spec here if a new Reason is added" do
-            expect(REASON_CLASSES.size).to eq 10
+          let(:expected_number_of_reason_classes) { 10 }
+
+          it "is 10 - add another spec here if a new Reason is added" do
+            expect(REASON_CLASSES.size).to eq expected_number_of_reason_classes
           end
         end
 
         describe "#to_s" do
-
           let(:consumer_selector) { double('consumer selector', description: "version 2 of Foo") }
           let(:provider_selector) { double('provider selector', description: "version 6 of Bar") }
           let(:selectors) { [consumer_selector, provider_selector] }
@@ -38,7 +38,7 @@ module PactBroker
           context "when the reason is PactBroker::Matrix::VerificationFailed" do
             let(:reason) { PactBroker::Matrix::VerificationFailed.new(*selectors) }
 
-            its(:to_s) { is_expected.to eq "The verification between version 2 of Foo and version 6 of Bar failed" }
+            its(:to_s) { is_expected.to eq "The verification for the pact between version 2 of Foo and version 6 of Bar failed" }
           end
 
           context "when the reason is PactBroker::Matrix::NoDependenciesMissing" do

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

@@ -6,6 +6,7 @@ module PactBroker
       describe VerifiablePactsQueryDecorator do
 
         let(:provider_version_tags) { %w[dev] }
+        let(:provider_version_branch) { "main" }
 
         subject { VerifiablePactsQueryDecorator.new(OpenStruct.new).from_hash(params)  }
 
@@ -13,6 +14,7 @@ module PactBroker
           let(:params) do
             {
               "providerVersionTags" => provider_version_tags,
+              "providerVersionBranch" => provider_version_branch,
               "consumerVersionSelectors" => consumer_version_selectors
             }
           end
@@ -25,6 +27,10 @@ module PactBroker
             expect(subject.consumer_version_selectors).to be_a(PactBroker::Pacts::Selectors)
           end
 
+          it "parses the provider version branch" do
+            expect(subject.provider_version_branch).to eq "main"
+          end
+
           context "when latest is not specified" do
             let(:consumer_version_selectors) do
               [{ "tag" => "dev" }]

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

@@ -6,6 +6,24 @@ module PactBroker
     module Decorators
       describe VersionDecorator do
 
+        describe "from_json" do
+          let(:hash) do
+            {
+              branch: "branch",
+              buildUrl: "buildUrl",
+              tags: [{ name: "main" }]
+            }
+          end
+
+          subject { VersionDecorator.new(OpenStruct.new).from_json(hash.to_json) }
+
+          it "sets the properties" do
+            expect(subject.branch).to eq "branch"
+            expect(subject.build_url).to eq "buildUrl"
+            expect(subject.tags.first.name).to eq "main"
+          end
+        end
+
         let(:version) do
           TestDataBuilder.new
             .create_consumer("Consumer")

data/spec/lib/pact_broker/api/resources/default_base_resource_approval_spec.rb

@@ -45,7 +45,7 @@ module PactBroker
               if resource.respond_to?(:policy_pacticipant)
                 resource_class_data[:resource_class_data] = resource.policy_pacticipant
               end
-                resource_class_data
+              resource_class_data
             else
               nil
             end

data/spec/lib/pact_broker/api/resources/default_base_resource_spec.rb

@@ -90,7 +90,6 @@ module PactBroker
         describe "base_url" do
           before do
             allow(env).to receive(:[]).with("pactbroker.base_url").and_return("http://rack")
-            allow(PactBroker.configuration).to receive(:base_url).and_return("http://foo")
           end
 
           context "when pactbroker.base_url is set on the env" do
@@ -99,20 +98,10 @@ module PactBroker
             end
           end
 
-          context "when PactBroker.configuration.base_url is not nil" do
+          context "when the rack env value is not set" do
             before do
               allow(env).to receive(:[]).with("pactbroker.base_url").and_return(nil)
             end
-            it "returns the configured base URL" do
-              expect(subject.base_url).to eq "http://foo"
-            end
-          end
-
-          context "when PactBroker.configuration.base_url is nil and the rack env value is not set" do
-            before do
-              allow(env).to receive(:[]).with("pactbroker.base_url").and_return(nil)
-              allow(PactBroker.configuration).to receive(:base_url).and_return(nil)
-            end
 
             it "returns the base URL from the request" do
               expect(subject.base_url).to eq "http://example.org"

data/spec/lib/pact_broker/api/resources/provider_pacts_for_verification_spec.rb

@@ -16,6 +16,7 @@ module PactBroker
         let(:decorator) { instance_double('PactBroker::Api::Decorators::VerifiablePactsDecorator') }
         let(:query) do
           {
+            provider_version_branch: "main",
             provider_version_tags: ['master'],
             consumer_version_selectors: [ { tag: 'dev', latest: 'true' }],
             include_pending_status: 'true',
@@ -30,6 +31,7 @@ module PactBroker
             # Naughty not mocking out the query parsing...
             expect(PactBroker::Pacts::Service).to receive(:find_for_verification).with(
               "Bar",
+              "main",
               ["master"],
               PactBroker::Pacts::Selectors.new([PactBroker::Pacts::Selector.latest_for_tag("dev")]),
               {
@@ -56,6 +58,7 @@ module PactBroker
         describe "POST" do
           let(:request_body) do
             {
+              providerVersionBranch: "main",
               providerVersionTags: ['master'],
               consumerVersionSelectors: [ { tag: 'dev', latest: true }],
               includePendingStatus: true,
@@ -76,6 +79,7 @@ module PactBroker
             # Naughty not mocking out the query parsing...
             expect(PactBroker::Pacts::Service).to receive(:find_for_verification).with(
               "Bar",
+              "main",
               ["master"],
               PactBroker::Pacts::Selectors.new([PactBroker::Pacts::Selector.latest_for_tag("dev")]),
               {