pact_broker-client 1.38.1 → 1.41.0

data/spec/service_providers/record_deployment_spec.rb

@@ -1,8 +1,7 @@
 require 'service_providers/pact_helper'
 require 'pact_broker/client/versions/record_deployment'
 
-RSpec.describe "recording a deployment", pact: true do
-
+RSpec.describe "recording a deployment", pact: true, skip: true do
   include_context "pact broker"
   include PactBrokerPactHelperMethods
 
@@ -10,13 +9,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) { "blue" }
   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 +147,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
+          target: target
         }
       )
       .will_respond_with(
         status: 201,
         headers: pact_broker_response_headers,
         body: {
-          replacedPreviousDeployedVersion: replaced_previous_deployed_version
+          target: target
         }
       )
   end
@@ -176,7 +175,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 "target" => target
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,10 +1,11 @@
 require 'webmock/rspec'
 
-ENV['PACT_BROKER_FEATURES'] = 'deployments'
+ENV['PACT_BROKER_FEATURES'] = 'deployments publish_contracts ignore'
 
 WebMock.disable_net_connect!(allow_localhost: true)
 
 require "./spec/support/shared_context.rb"
+require "./spec/support/approvals.rb"
 
 is_windows = (RbConfig::CONFIG['host_os'] =~ /bccwin|cygwin|djgpp|mingw|mswin|wince/i) != nil
 is_ci = ENV['CI'] == 'true'

data/spec/support/approvals.rb

@@ -0,0 +1,26 @@
+require 'approvals/rspec'
+require 'pact/support'
+
+Approvals.configure do |c|
+  c.approvals_path = 'spec/fixtures/approvals/'
+end
+
+def print_diff(exception)
+  parts = exception.message.split('"')
+  received_file = parts[1]
+  approved_file = parts[3]
+  if File.exist?(received_file) && File.exist?(approved_file)
+    received_hash = JSON.parse(File.read(received_file))
+    approved_hash = JSON.parse(File.read(approved_file))
+    diff = Pact::Matchers.diff(approved_hash, received_hash)
+    puts Pact::Matchers::UnixDiffFormatter.call(diff)
+  end
+end
+
+RSpec.configure do | config |
+  config.after(:each) do | example |
+    if example.exception.is_a?(Approvals::ApprovalError)
+      print_diff(example.exception)
+    end
+  end
+end

data/spec/support/shared_context.rb

@@ -1,6 +1,11 @@
 require 'pact_broker/client/pact_hash'
-shared_context "pact broker" do
+require 'pact_broker/client/hal/http_client'
 
+shared_context "pact broker" 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
   let(:pact_hash) { PactBroker::Client::PactHash[consumer: {name: 'Condor'}, provider: {name: 'Pricing Service'}, interactions: []] }
   let(:consumer_contract) { Pact::ConsumerContract.from_hash pact_hash }
   let(:pact_json) { pact_hash.to_json }
@@ -16,5 +21,4 @@ shared_context "pact broker" do
   let(:put_request_headers)     { { 'Content-Type' => 'application/json', 'Accept' => 'application/hal+json'} }
   let(:post_request_headers)    { { 'Content-Type' => 'application/json', 'Accept' => 'application/hal+json'} }
   let(:get_request_headers)     { { 'Accept' => 'application/hal+json'} }
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.38.1
+  version: 1.41.0
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -170,6 +170,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: approvals
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.24
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.24
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Client for the Pact Broker. Publish, retrieve and query pacts and verification
   results.
 email:
@@ -212,7 +232,9 @@ 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/colorize_notices.rb
 - lib/pact_broker/client/command_result.rb
 - lib/pact_broker/client/create_tag.rb
 - lib/pact_broker/client/error.rb
@@ -227,6 +249,7 @@ files:
 - lib/pact_broker/client/hal_client_methods.rb
 - lib/pact_broker/client/hash_refinements.rb
 - lib/pact_broker/client/matrix.rb
+- lib/pact_broker/client/matrix/abbreviate_version_number.rb
 - lib/pact_broker/client/matrix/formatter.rb
 - lib/pact_broker/client/matrix/json_formatter.rb
 - lib/pact_broker/client/matrix/resource.rb
@@ -240,6 +263,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
@@ -255,12 +279,16 @@ files:
 - lib/pact_broker/client/webhooks/test.rb
 - lib/pact_broker_client.rb
 - pact-broker-client.gemspec
+- script/approve-all.sh
 - script/create-pacticipant.sh
 - 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/approvals/can_i_deploy_ignore.approved.txt
+- 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 +312,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
@@ -295,6 +323,7 @@ files:
 - spec/service_providers/extra_goodies_spec.rb
 - spec/service_providers/list_latest_pact_versions_spec.rb.bak
 - spec/service_providers/pact_broker_client_create_version_spec.rb
+- spec/service_providers/pact_broker_client_matrix_ignore_spec.rb
 - spec/service_providers/pact_broker_client_matrix_spec.rb
 - spec/service_providers/pact_broker_client_pacticipant_version_spec.rb
 - spec/service_providers/pact_broker_client_publish_spec.rb
@@ -305,9 +334,11 @@ 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
+- spec/support/approvals.rb
 - spec/support/cli_test_pacts/bar.json
 - spec/support/cli_test_pacts/foo.json
 - spec/support/latest_pacts_for_provider.json
@@ -339,11 +370,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.17
 signing_key: 
 specification_version: 4
 summary: See description
 test_files:
+- spec/fixtures/approvals/can_i_deploy_ignore.approved.txt
+- 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 +400,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
@@ -378,6 +411,7 @@ test_files:
 - spec/service_providers/extra_goodies_spec.rb
 - spec/service_providers/list_latest_pact_versions_spec.rb.bak
 - spec/service_providers/pact_broker_client_create_version_spec.rb
+- spec/service_providers/pact_broker_client_matrix_ignore_spec.rb
 - spec/service_providers/pact_broker_client_matrix_spec.rb
 - spec/service_providers/pact_broker_client_pacticipant_version_spec.rb
 - spec/service_providers/pact_broker_client_publish_spec.rb
@@ -388,9 +422,11 @@ 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
+- spec/support/approvals.rb
 - spec/support/cli_test_pacts/bar.json
 - spec/support/cli_test_pacts/foo.json
 - spec/support/latest_pacts_for_provider.json