pact_broker 2.82.0 → 2.85.1

data/spec/features/get_branch_version_spec.rb

@@ -0,0 +1,12 @@
+describe "Get a branch version" do
+  before do
+    td.create_consumer("Foo")
+      .create_consumer_version("1234", branch: "main")
+  end
+  let(:path) { PactBroker::Api::PactBrokerUrls.branch_version_url(PactBroker::Versions::BranchVersion.first) }
+  let(:headers) { { "CONTENT_TYPE" => "application/json" } }
+
+  subject { get(path, {}, headers) }
+
+  it { is_expected.to be_a_hal_json_success_response }
+end

data/spec/features/publish_pact_all_in_one_spec.rb

@@ -1,5 +1,4 @@
 RSpec.describe "publishing a pact using the all in one endpoint" do
-  # TODO merge branches
   let(:request_body_hash) do
     {
       :pacticipantName => "Foo",

data/spec/features/update_version_spec.rb

@@ -28,49 +28,9 @@ describe "Updating a pacticipant version" do
       end
 
       it "does not overwrites any properties that weren't specified" do
-        expect(response_body[:branch]).to eq "original-branch"
         expect(response_body[:buildUrl]).to eq "new-build-url"
       end
 
-      context "when the same not null branch is specified" do
-        let(:version_hash) { { branch: "original-branch" } }
-
-        its(:status) { is_expected.to eq 200 }
-      end
-
-      context "when the existing version has a branch, and the new branch is different", skip: true do
-        let(:version_hash) { { branch: "new-branch" } }
-
-        its(:status) { is_expected.to eq 409 }
-
-        it "returns an error" do
-          expect(response_body[:errors][:branch].first).to include "cannot be changed"
-        end
-      end
-
-      context "when the existing version has a branch, and the new branch is nil", skip: true do
-        let(:version_hash) { { branch: nil } }
-
-        its(:status) { is_expected.to eq 409 }
-
-        it "returns an error" do
-          expect(response_body[:errors][:branch].first).to include "cannot be changed"
-        end
-      end
-
-      context "when the existing version does not have a branch, and the new branch is specified" do
-        let(:original_branch) { nil }
-
-        its(:status) { is_expected.to eq 200 }
-      end
-
-      context "when the existing version does not have a branch, and the new branch is also nil" do
-        let(:original_branch) { nil }
-        let(:version_hash) { { branch: nil } }
-
-        its(:status) { is_expected.to eq 200 }
-      end
-
       context "when no tags are specified" do
         it "does not change the tags" do
           expect { subject }.to_not change { PactBroker::Domain::Version.for("Foo", "1234").tags }
@@ -117,21 +77,6 @@ describe "Updating a pacticipant version" do
           .create_consumer_version_tag("dev")
       end
 
-      context "when the branch is attempted to be changed", skip: true do
-        let(:version_hash) { { branch: "new-branch" } }
-
-        its(:status) { is_expected.to eq 409 }
-      end
-
-      context "when the branch is not attempted to be changed" do
-        let(:version_hash) { { branch: "original-branch" } }
-
-        it "overwrites the direct properties and blanks out any unprovided ones" do
-          expect(response_body[:branch]).to eq "original-branch"
-          expect(response_body).to_not have_key(:buildUrl)
-        end
-      end
-
       context "when no tags are specified" do
         it "does not change the tags" do
           expect { subject }.to_not change { PactBroker::Domain::Version.for("Foo", "1234").tags }

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

@@ -3,6 +3,9 @@
     {
       "resource_class_name": "PactBroker::Api::Resources::AllWebhooks"
     },
+    {
+      "resource_class_name": "PactBroker::Api::Resources::BranchVersion"
+    },
     {
       "resource_class_name": "PactBroker::Api::Resources::Clean"
     },
@@ -46,6 +49,10 @@
       "resource_class_name": "PactBroker::Api::Resources::PactVersions",
       "resource_class_data": "consumer"
     },
+    {
+      "resource_class_name": "PactBroker::Api::Resources::PactVersionsForBranch",
+      "resource_class_data": "consumer"
+    },
     {
       "resource_class_name": "PactBroker::Api::Resources::PactWebhooks"
     },

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

@@ -30,7 +30,7 @@
     "status": 200,
     "headers": {
       "Content-Type": "application/hal+json;charset=utf-8",
-      "Content-Length": "2992"
+      "Content-Length": "2976"
     },
     "body": {
       "logs": [
@@ -111,7 +111,6 @@
         },
         "version": {
           "number": "1",
-          "branch": "main",
           "buildUrl": "http://ci/builds/1234",
           "_links": {
             "self": {

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

@@ -30,7 +30,7 @@
     "status": 200,
     "headers": {
       "Content-Type": "application/hal+json;charset=utf-8",
-      "Content-Length": "2972"
+      "Content-Length": "2956"
     },
     "body": {
       "logs": [
@@ -111,7 +111,6 @@
         },
         "version": {
           "number": "1",
-          "branch": "main",
           "buildUrl": "http://ci/builds/1234",
           "_links": {
             "self": {

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

@@ -30,7 +30,7 @@
     "status": 200,
     "headers": {
       "Content-Type": "application/hal+json;charset=utf-8",
-      "Content-Length": "2929"
+      "Content-Length": "2913"
     },
     "body": {
       "logs": [
@@ -102,7 +102,6 @@
         },
         "version": {
           "number": "1",
-          "branch": "main",
           "buildUrl": "http://ci/builds/1234",
           "_links": {
             "self": {

data/spec/fixtures/dashboard.json

@@ -21,7 +21,8 @@
             }
           },
           "number": "1",
-          "branch": "main"
+          "branch": "main",
+          "headBranchNames": ["main"]
         }
       },
       "latestVerificationResult": {
@@ -75,7 +76,8 @@
         "name": "Bar",
         "version": {
           "number": "2",
-          "branch": "main"
+          "branch": "main",
+          "headBranchNames": ["main"]
         }
       },
       "verificationStatus": "wiffle",

data/spec/integration/app_spec.rb

@@ -9,6 +9,7 @@ module PactBroker
     end
 
     let(:hal_browser_enabled) { true }
+    let(:network_url) { "/pacticipants/Some%20Consumer/network" }
     let(:group_url) { "/groups/Some%20Consumer" }
     let(:enable_diagnostic_endpoints) { false }
 
@@ -52,13 +53,12 @@ module PactBroker
         end
       end
 
-      describe "a request for /groups/:pacticipant_name" do
-        let(:path) { "/groups/Some%20Consumer" }
+      describe "a request for /pacticipants/:pacticipant_name" do
+        let(:path) { "/pacticipants/Some%20Consumer" }
 
         it "returns the group page" do
           expect(subject.status).to eq 200
           expect(subject.headers["Content-Type"]).to include "text/html"
-          expect(subject.body).to include "Network graph"
           expect(subject.body).to include "Some Consumer"
         end
 
@@ -79,12 +79,12 @@ module PactBroker
       end
 
       describe "a request the group containing a pacticipant" do
-        let(:path) { group_url }
+        let(:path) { network_url }
 
-        it "returns the HTML representation of the group" do
+        it "returns the HTML representation of the pacticipant" do
           expect(subject.status).to eq 200
           expect(subject.headers["Content-Type"]).to include "text/html"
-          expect(subject.body).to include "Network graph"
+          expect(subject.body).to include "Network Graph"
         end
       end
 

data/spec/integration/ui/index_spec.rb

@@ -1,9 +1,7 @@
 require "pact_broker/ui/app"
 
 describe "UI index" do
-
   let(:app) { PactBroker::UI::App.new }
-  let(:td) { TestDataBuilder.new }
   let(:params) { {} }
 
   before do

data/spec/integration/ui/matrix_spec.rb

@@ -2,7 +2,6 @@ require "pact_broker/ui/app"
 
 describe "UI matrix" do
   let(:app) { PactBroker::UI::App.new }
-  let(:td) { TestDataBuilder.new }
   let(:params) { {} }
 
   before do

data/spec/lib/pact/doc/markdown/consumer_contract_renderer_spec.rb

@@ -27,8 +27,8 @@ module Pact
             let(:consumer_contract) { Pact::ConsumerContract.from_uri "./spec/support/markdown_pact_with_markdown_chars_in_names.json" }
 
             it "escapes the markdown characters" do
-              expect(subject.call).to include '### A pact between Some\*Consumer\*App and Some\_Provider\_App'
-              expect(subject.call).to include '#### Requests from Some\*Consumer\*App to Some\_Provider\_App'
+              expect(subject.call).to include '# A pact between Some\*Consumer\*App and Some\_Provider\_App'
+              expect(subject.call).to include '### Requests from Some\*Consumer\*App to Some\_Provider\_App'
             end
           end
 

data/spec/lib/pact_broker/api/contracts/{verifiable_pacts_json_query_schema_combinations_spec.rb → pacts_for_verification_json_query_schema_combinations_spec.rb}

@@ -1,9 +1,9 @@
-require "pact_broker/api/contracts/verifiable_pacts_json_query_schema"
+require "pact_broker/api/contracts/pacts_for_verification_json_query_schema"
 
 module PactBroker
   module Api
     module Contracts
-      describe VerifiablePactsJSONQuerySchema do
+      describe PactsForVerificationJSONQuerySchema do
         ALL_PROPERTIES = {
           mainBranch: true,
           tag: "tag",
@@ -46,7 +46,7 @@ module PactBroker
 
             it "is valid" do
               params = { consumerVersionSelectors: [selector] }
-              expect(VerifiablePactsJSONQuerySchema.(params)).to be_empty
+              expect(PactsForVerificationJSONQuerySchema.(params)).to be_empty
             end
 
             extra_keys = ALL_PROPERTIES.keys - valid_key_combination - [:consumer]
@@ -58,11 +58,11 @@ module PactBroker
               describe "with #{selector_with_extra_key}" do
                 if expect_to_be_valid
                   it "is valid" do
-                    expect(VerifiablePactsJSONQuerySchema.(params)).to be_empty
+                    expect(PactsForVerificationJSONQuerySchema.(params)).to be_empty
                   end
                 else
                   it "is not valid" do
-                    expect(VerifiablePactsJSONQuerySchema.(params)).to_not be_empty
+                    expect(PactsForVerificationJSONQuerySchema.(params)).to_not be_empty
                   end
                 end
               end
@@ -73,7 +73,7 @@ module PactBroker
                 it "is valid" do
                   params = { consumerVersionSelectors: [selector_with_consumer] }
 
-                  expect(VerifiablePactsJSONQuerySchema.(params).empty?).to be true
+                  expect(PactsForVerificationJSONQuerySchema.(params).empty?).to be true
                 end
               end
             end

data/spec/lib/pact_broker/api/contracts/{verifiable_pacts_json_query_schema_spec.rb → pacts_for_verification_json_query_schema_spec.rb}

@@ -1,9 +1,9 @@
-require "pact_broker/api/contracts/verifiable_pacts_json_query_schema"
+require "pact_broker/api/contracts/pacts_for_verification_json_query_schema"
 
 module PactBroker
   module Api
     module Contracts
-      describe VerifiablePactsJSONQuerySchema do
+      describe PactsForVerificationJSONQuerySchema do
         before do
           allow(PactBroker::Deployments::EnvironmentService).to receive(:find_by_name).and_return(environment)
         end
@@ -25,7 +25,7 @@ module PactBroker
           }]
         end
 
-        subject { VerifiablePactsJSONQuerySchema.(params) }
+        subject { PactsForVerificationJSONQuerySchema.(params) }
 
         context "when the params are valid" do
           it "has no errors" do

data/spec/lib/pact_broker/api/contracts/{verifiable_pacts_query_schema_spec.rb → pacts_for_verification_query_string_schema_spec.rb}

@@ -1,9 +1,9 @@
-require "pact_broker/api/contracts/verifiable_pacts_query_schema"
+require "pact_broker/api/contracts/pacts_for_verification_query_string_schema"
 
 module PactBroker
   module Api
     module Contracts
-      describe VerifiablePactsQuerySchema do
+      describe PactsForVerificationQueryStringSchema do
         let(:params) do
           {
             provider_version_tags: provider_version_tags,
@@ -20,7 +20,7 @@ module PactBroker
           }]
         end
 
-        subject { VerifiablePactsQuerySchema.(params) }
+        subject { PactsForVerificationQueryStringSchema.(params) }
 
         context "when the params are valid" do
           it "has no errors" do

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

@@ -21,9 +21,9 @@ module PactBroker
             webhook_status: "blah",
             pseudo_branch_verification_status: "wiffle",
             provider_version_number: provider_version.number,
-            provider_version_branch: provider_version.branch,
+            provider_version_branches: ["main"],
             consumer_version_number: consumer_version.number,
-            consumer_version_branch: consumer_version.branch,
+            consumer_version_branches: ["main"],
             tag_names: ["prod"],
             latest_verification_latest_tags: [double("tag", name: "dev", latest?: true)]
           )
@@ -32,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, branch: "main") }
-        let(:provider_version) { instance_double("PactBroker::Domain::Version", number: "2", pacticipant: provider, branch: "main") }
+        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(:last_webhook_execution_date) { created_at }
         let(:base_url) { "http://example.org" }
         let(:options) { { user_options: { base_url: base_url } } }
@@ -67,7 +67,7 @@ module PactBroker
         subject { JSON.parse(dashboard_json) }
 
         it "creates some json" do
-          expect(subject).to match_pact(expected_hash, {allow_unexpected_keys: false})
+          expect(subject).to match_pact(expected_hash, { allow_unexpected_keys: false })
         end
 
         context "when the pact has never been verified" do
@@ -76,7 +76,7 @@ module PactBroker
           it "has a null last verification and provider version" do
             expected_hash["items"][0]["latestVerificationResult"] = nil
             expected_hash["items"][0]["provider"]["version"] = nil
-            expect(subject).to match_pact(expected_hash, {allow_unexpected_keys: false})
+            expect(subject).to match_pact(expected_hash, { allow_unexpected_keys: false })
           end
         end
 
@@ -85,7 +85,7 @@ module PactBroker
 
           it "has a null latestWebhookExecution" do
             expected_hash["items"][0]["latestWebhookExecution"] = nil
-            expect(subject).to match_pact(expected_hash, {allow_unexpected_keys: false})
+            expect(subject).to match_pact(expected_hash, { allow_unexpected_keys: false })
           end
         end
       end

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

@@ -10,6 +10,7 @@ module PactBroker
         describe "to_json" do
           before do
             allow_any_instance_of(ReasonDecorator).to receive(:to_s).and_return("foo")
+            allow_any_instance_of(PactBroker::Api::PactBrokerUrls).to receive(:branch_version_url).and_return("branch_version_url")
           end
           let(:verification_date) { DateTime.new(2017, 12, 31) }
           let(:pact_created_at) { DateTime.new(2017, 1, 1) }
@@ -20,13 +21,13 @@ module PactBroker
               {
                 consumer_name: "Consumer",
                 consumer_version_number: "1.0.0",
-                consumer_version_branch: "main",
+                consumer_version_branch_versions: consumer_version_branch_versions,
                 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_version_branch_versions: provider_version_branch_versions,
                 provider_name: "Provider",
                 success: row_1_success,
                 verification_number: 1,
@@ -40,12 +41,12 @@ module PactBroker
               {
                 consumer_name: "Consumer",
                 consumer_version_number: "1.0.0",
-                consumer_version_branch: "main",
+                consumer_version_branch_versions: [],
                 consumer_version_tags: [],
                 pact_version_sha: "1234",
                 pact_created_at: pact_created_at,
                 provider_version_number: nil,
-                provider_version_branch: nil,
+                provider_version_branch_versions: [],
                 provider_name: "Provider",
                 success: row_2_success,
                 verification_number: nil,
@@ -65,6 +66,12 @@ module PactBroker
               version: {
                 number: "1.0.0",
                 branch: "main",
+                branches: [
+                  name: "main",
+                  _links: {
+
+                  }
+                ],
                 _links: {
                   self: {
                     href: "http://example.org/pacticipants/Consumer/versions/1.0.0"
@@ -141,6 +148,10 @@ module PactBroker
 
           let(:consumer_version) { double("consumer version", number: "1.0.0", pacticipant: double("consumer", name: "Consumer")) }
 
+          let(:consumer_version_branch_versions) do
+            [ instance_double("PactBroker::Versions::BranchVersion", branch_name: "main", latest?: true) ]
+          end
+
           let(:consumer_version_tags) do
             [
               double("tag", name: "prod", latest?: true, version: consumer_version, created_at: DateTime.now )
@@ -149,6 +160,10 @@ module PactBroker
 
           let(:provider_version) { double("provider version", number: "4.5.6", pacticipant: double("provider", name: "Provider")) }
 
+          let(:provider_version_branch_versions) do
+            [ instance_double("PactBroker::Versions::BranchVersion", branch_name: "feat/x", latest?: true) ]
+          end
+
           let(:provider_version_tags) do
             [
               double("tag", name: "master", latest?: false, version: provider_version, created_at: DateTime.now)