pact_broker-client 1.38.0 → 1.40.0

data/spec/service_providers/pact_broker_client_create_version_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'pact_helper'
 require 'pact_broker/client'
-require 'pact_broker/client/publish_pacts'
+require 'pact_broker/client/publish_pacts_the_old_way'
 
 describe PactBroker::Client::Versions, pact: true do
 
@@ -9,7 +9,7 @@ describe PactBroker::Client::Versions, pact: true do
 
   describe "creating a pacticipant version" do
     before do
-      allow(publish_pacts).to receive(:consumer_names).and_return(["Foo"])
+      allow(publish_pacts_the_old_way).to receive(:consumer_names).and_return(["Foo"])
       allow($stdout).to receive(:puts)
     end
     let(:version_path) { "/HAL-REL-PLACEHOLDER-INDEX-PB-PACTICIPANT-VERSION-{pacticipant}-{version}" }
@@ -18,11 +18,11 @@ describe PactBroker::Client::Versions, pact: true do
     let(:branch) { "main" }
     let(:build_url) { "http://my-ci/builds/1" }
     let(:consumer_version_params) { { number: number, branch: branch, build_url: build_url } }
-    let(:publish_pacts) { PactBroker::Client::PublishPacts.new(pact_broker.mock_service_base_url, ["some-pact.json"], consumer_version_params, {}) }
+    let(:publish_pacts_the_old_way) { PactBroker::Client::PublishPactsTheOldWay.new(pact_broker.mock_service_base_url, ["some-pact.json"], consumer_version_params, {}) }
     let(:provider_state) { "version #{number} of pacticipant Foo does not exist" }
     let(:expected_response_status) { 201 }
 
-    subject { publish_pacts.send(:create_consumer_versions) }
+    subject { publish_pacts_the_old_way.send(:create_consumer_versions) }
 
     before do
       pact_broker

data/spec/service_providers/publish_pacts_spec.rb

@@ -0,0 +1,115 @@
+require 'pact_broker/client/publish_pacts'
+require 'service_providers/pact_helper'
+
+RSpec.describe "publishing contracts", pact: true do
+  before do
+    allow_any_instance_of(PactBroker::Client::Hal::HttpClient).to receive(:sleep)
+    allow_any_instance_of(PactBroker::Client::Hal::HttpClient).to receive(:default_max_tries).and_return(1)
+  end
+  include_context "pact broker"
+  include PactBrokerPactHelperMethods
+
+  let(:pacticipant_name) { "Foo" }
+  let(:version_number) { "5556b8149bf8bac76bc30f50a8a2dd4c22c85f30" }
+  let(:output) { "text" }
+  let(:build_url) { "http://build" }
+  let(:consumer_version_params) do
+    {
+      pacticipant_name: pacticipant_name,
+      number: version_number,
+      tags: ["dev"],
+      branch: "main",
+      build_url: build_url,
+      output: output
+    }
+  end
+  let(:pact_file_path_1) { "spec/fixtures/foo-bar.json" }
+  let(:pact_file_paths) { [pact_file_path_1] }
+  let(:options) { {} }
+  let(:pact_broker_client_options) { {} }
+  let(:expected_content) { Base64.strict_encode64(JSON.parse(File.read(pact_file_path_1)).to_json) }
+  let(:request_body) do
+    {
+      pacticipantName: pacticipant_name,
+      pacticipantVersionNumber: version_number,
+      branch: "main",
+      tags: ["dev"],
+      buildUrl: "http://build",
+      contracts: [
+        {
+          consumerName: pacticipant_name,
+          providerName: "Bar",
+          specification: "pact",
+          contentType: "application/json",
+          content: expected_content,
+          writeMode: "overwrite"
+        }
+      ]
+    }
+  end
+
+  subject { PactBroker::Client::PublishPacts.call(broker_base_url, pact_file_paths, consumer_version_params, options, pact_broker_client_options) }
+
+  def mock_index
+    pact_broker
+      .given("the pb:publish-contracts relations exists in the index resource")
+      .upon_receiving("a request for the index resource")
+      .with(
+          method: "GET",
+          path: '/',
+          headers: get_request_headers).
+        will_respond_with(
+          status: 200,
+          headers: pact_broker_response_headers,
+          body: {
+            _links: {
+              :'pb:publish-contracts' => {
+                href: placeholder_url_term("pb:publish-contracts")
+              }
+            }
+          }
+        )
+  end
+
+  def mock_contract_publication
+    pact_broker
+      .upon_receiving("a request to publish contracts")
+      .with(
+          method: "POST",
+          path: '/HAL-REL-PLACEHOLDER-PB-PUBLISH-CONTRACTS',
+          headers: post_request_headers,
+          body: request_body).
+        will_respond_with(
+          status: 200,
+          headers: pact_broker_response_headers,
+          body: {
+            _embedded: {
+              pacticipant: {
+                name: pacticipant_name
+              },
+              version: {
+                number: version_number,
+                buildUrl: build_url
+              }
+            },
+            logs: Pact.each_like(level: "info", message: "some message"),
+            _links: {
+              :'pb:pacticipant-version-tags' => [{ name: "dev"} ],
+              :'pb:contracts' => [{ href: Pact.like("http://some-pact") }]
+            }
+          }
+        )
+  end
+
+  context "with valid params" do
+    before do
+      mock_index
+      mock_contract_publication
+    end
+
+    it "returns a success result" do
+      expect(subject.success).to be true
+      expect(subject.message).to include "some message"
+    end
+  end
+end

data/spec/service_providers/record_deployment_spec.rb

@@ -10,13 +10,13 @@ RSpec.describe "recording a deployment", pact: true do
   let(:version_number) { "5556b8149bf8bac76bc30f50a8a2dd4c22c85f30" }
   let(:environment_name) { "test" }
   let(:output) { "text" }
-  let(:replaced_previous_deployed_version) { true }
+  let(:target) { true }
   let(:params) do
     {
       pacticipant_name: pacticipant_name,
       version_number: version_number,
       environment_name: environment_name,
-      replaced_previous_deployed_version: replaced_previous_deployed_version,
+      target: target,
       output: output
     }
   end
@@ -148,14 +148,14 @@ RSpec.describe "recording a deployment", pact: true do
         path: "/HAL-REL-PLACEHOLDER-PB-RECORD-DEPLOYMENT-FOO-5556B8149BF8BAC76BC30F50A8A2DD4C22C85F30-TEST",
         headers: post_request_headers,
         body: {
-          replacedPreviousDeployedVersion: replaced_previous_deployed_version
+          replacedPreviousDeployedVersion: target
         }
       )
       .will_respond_with(
         status: 201,
         headers: pact_broker_response_headers,
         body: {
-          replacedPreviousDeployedVersion: replaced_previous_deployed_version
+          replacedPreviousDeployedVersion: target
         }
       )
   end
@@ -176,7 +176,7 @@ RSpec.describe "recording a deployment", pact: true do
       let(:output) { "json" }
 
       it "returns the JSON payload" do
-        expect(JSON.parse(subject.message)).to eq "replacedPreviousDeployedVersion" => replaced_previous_deployed_version
+        expect(JSON.parse(subject.message)).to eq "replacedPreviousDeployedVersion" => target
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'webmock/rspec'
 
-ENV['PACT_BROKER_FEATURES'] = 'deployments'
+ENV['PACT_BROKER_FEATURES'] = 'deployments publish_contracts'
 
 WebMock.disable_net_connect!(allow_localhost: true)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.38.0
+  version: 1.40.0
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -212,6 +212,7 @@ files:
 - lib/pact_broker/client/cli/create_or_update_webhook_long_desc.txt
 - lib/pact_broker/client/cli/create_webhook_long_desc.txt
 - lib/pact_broker/client/cli/custom_thor.rb
+- lib/pact_broker/client/cli/record_deployment_long_desc.txt
 - lib/pact_broker/client/cli/version_selector_options_parser.rb
 - lib/pact_broker/client/command_result.rb
 - lib/pact_broker/client/create_tag.rb
@@ -240,6 +241,7 @@ files:
 - lib/pact_broker/client/pacts.rb
 - lib/pact_broker/client/pacts/list_latest_versions.rb
 - lib/pact_broker/client/publish_pacts.rb
+- lib/pact_broker/client/publish_pacts_the_old_way.rb
 - lib/pact_broker/client/retry.rb
 - lib/pact_broker/client/tasks.rb
 - lib/pact_broker/client/tasks/publication_task.rb
@@ -259,8 +261,10 @@ files:
 - script/generate-cli-usage.sh
 - script/publish-pact.sh
 - script/record-deployment.sh
+- script/record-undeployment.sh
 - script/release.sh
 - script/trigger-release.sh
+- spec/fixtures/foo-bar.json
 - spec/integration/can_i_deploy_spec.rb
 - spec/integration/create_version_tag_spec.rb
 - spec/lib/pact_broker/client/base_client_spec.rb
@@ -284,7 +288,7 @@ files:
 - spec/lib/pact_broker/client/pact_broker_client_spec.rb
 - spec/lib/pact_broker/client/pacticipants/create_spec.rb
 - spec/lib/pact_broker/client/pacticipants_spec.rb
-- spec/lib/pact_broker/client/publish_pacts_spec.rb
+- spec/lib/pact_broker/client/publish_pacts_the_old_way_spec.rb
 - spec/lib/pact_broker/client/retry_spec.rb
 - spec/lib/pact_broker/client/tasks/publication_task_spec.rb
 - spec/lib/pact_broker/client/versions/describe_spec.rb
@@ -305,6 +309,7 @@ files:
 - spec/service_providers/pact_broker_client_versions_spec.rb
 - spec/service_providers/pact_helper.rb
 - spec/service_providers/pacticipants_create_spec.rb
+- spec/service_providers/publish_pacts_spec.rb
 - spec/service_providers/record_deployment_spec.rb
 - spec/service_providers/webhooks_create_spec.rb
 - spec/spec_helper.rb
@@ -339,11 +344,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: See description
 test_files:
+- spec/fixtures/foo-bar.json
 - spec/integration/can_i_deploy_spec.rb
 - spec/integration/create_version_tag_spec.rb
 - spec/lib/pact_broker/client/base_client_spec.rb
@@ -367,7 +373,7 @@ test_files:
 - spec/lib/pact_broker/client/pact_broker_client_spec.rb
 - spec/lib/pact_broker/client/pacticipants/create_spec.rb
 - spec/lib/pact_broker/client/pacticipants_spec.rb
-- spec/lib/pact_broker/client/publish_pacts_spec.rb
+- spec/lib/pact_broker/client/publish_pacts_the_old_way_spec.rb
 - spec/lib/pact_broker/client/retry_spec.rb
 - spec/lib/pact_broker/client/tasks/publication_task_spec.rb
 - spec/lib/pact_broker/client/versions/describe_spec.rb
@@ -388,6 +394,7 @@ test_files:
 - spec/service_providers/pact_broker_client_versions_spec.rb
 - spec/service_providers/pact_helper.rb
 - spec/service_providers/pacticipants_create_spec.rb
+- spec/service_providers/publish_pacts_spec.rb
 - spec/service_providers/record_deployment_spec.rb
 - spec/service_providers/webhooks_create_spec.rb
 - spec/spec_helper.rb