pact_broker-client 1.38.0 → 1.40.0

data/spec/lib/pact_broker/client/hal/http_client_spec.rb

@@ -3,13 +3,13 @@ require 'pact_broker/client/hal/http_client'
 module PactBroker::Client
   module Hal
     describe HttpClient do
-      before do
-        allow(Retry).to receive(:until_truthy_or_max_times) { |&block| block.call }
-      end
-
       subject { HttpClient.new(username: 'foo', password: 'bar') }
 
       describe "get" do
+        before do
+          allow(subject).to receive(:until_truthy_or_max_times) { |&block| block.call }
+        end
+
         let!(:request) do
           stub_request(:get, "http://example.org/").
             with(  headers: {
@@ -41,18 +41,22 @@ module PactBroker::Client
           end
         end
 
-
         it "retries on failure" do
-          expect(Retry).to receive(:until_truthy_or_max_times)
+          expect(subject).to receive(:until_truthy_or_max_times)
           do_get
         end
 
         it "returns a response" do
           expect(do_get.body).to eq({"some" => "json"})
         end
+
       end
 
       describe "post" do
+        before do
+          allow(subject).to receive(:until_truthy_or_max_times) { |&block| block.call }
+        end
+
         let!(:request) do
           stub_request(:post, "http://example.org/").
             with(  headers: {
@@ -75,7 +79,7 @@ module PactBroker::Client
         end
 
         it "calls Retry.until_truthy_or_max_times" do
-          expect(Retry).to receive(:until_truthy_or_max_times)
+          expect(subject).to receive(:until_truthy_or_max_times)
           do_post
         end
 
@@ -100,6 +104,59 @@ module PactBroker::Client
           end
         end
       end
+
+      describe "integration test" do
+        before do
+          allow(subject).to receive(:sleep)
+        end
+
+        let(:do_get) { subject.get('http://example.org') }
+
+        context "with a 50x error is returned less than the max number of tries" do
+          let!(:request) do
+            stub_request(:get, "http://example.org").
+              to_return({ status: 500 }, { status: 502 }, { status: 503 }, { status: 200 })
+          end
+
+          it "retries" do
+            expect(do_get.status).to eq 200
+          end
+        end
+
+        context "with a 50x error is returned more than the max number of tries" do
+          let!(:request) do
+            stub_request(:get, "http://example.org").
+              to_return({ status: 500 }, { status: 501 }, { status: 502 }, { status: 503 }, { status: 504 })
+          end
+
+          it "retries and returns the last 50x response" do
+            expect(do_get.status).to eq 504
+          end
+        end
+
+        context "when exceptions are raised" do
+          before do
+            allow($stderr).to receive(:puts)
+          end
+
+          let!(:request) do
+            stub_request(:get, "http://example.org")
+              .to_raise(Errno::ECONNREFUSED)
+          end
+
+          it "logs the error" do
+            expect($stderr).to receive(:puts).with(/Errno::ECONNREFUSED/)
+            begin
+              do_get
+            rescue Errno::ECONNREFUSED
+            end
+          end
+
+          it "retries and raises the last exception" do
+            expect { do_get }.to raise_error(Errno::ECONNREFUSED)
+          end
+        end
+      end
     end
   end
 end

data/spec/lib/pact_broker/client/pacticipants/create_spec.rb

@@ -5,6 +5,9 @@ module PactBroker
     module Pacticipants2
       describe Create do
         describe ".call" do
+          before do
+            allow_any_instance_of(PactBroker::Client::Hal::HttpClient).to receive(:sleep)
+          end
           let(:pact_broker_client_options) { {} }
           let(:broker_base_url) { "http://url" }
           let(:params) { { name: 'Foo' } }

data/spec/lib/pact_broker/client/{publish_pacts_spec.rb → publish_pacts_the_old_way_spec.rb}

@@ -1,11 +1,11 @@
 require 'spec_helper'
 require 'fakefs/safe'
-require 'pact_broker/client/publish_pacts'
+require 'pact_broker/client/publish_pacts_the_old_way'
 require 'json'
 
 module PactBroker
   module Client
-    describe PublishPacts do
+    describe PublishPactsTheOldWay do
 
       # The amount of stubbing that we have to do here indicates this class is doing
       # TOO MUCH and needs to be split up!
@@ -23,7 +23,7 @@ module PactBroker
         File.open("spec/pacts/consumer-provider.json", "w") { |file| file << pact_hash.to_json }
         File.open("spec/pacts/consumer-provider-2.json", "w") { |file| file << pact_hash.to_json }
         File.open("spec/pacts/foo-bar.json", "w") { |file| file << pact_hash_2.to_json }
-        allow_any_instance_of(PublishPacts).to receive(:create_index_entry_point).and_return(index_entry_point)
+        allow_any_instance_of(PublishPactsTheOldWay).to receive(:create_index_entry_point).and_return(index_entry_point)
       end
 
       after do
@@ -63,8 +63,9 @@ module PactBroker
       let(:index_entry_point) { instance_double("PactBroker::Client::Hal::EntryPoint", :get! => index_resource )}
       let(:index_resource) { instance_double("PactBroker::Client::Hal::Entity", can?: can_create_version ) }
       let(:can_create_version) { false }
+      let(:options) { {} }
 
-      subject { PublishPacts.new(pact_broker_base_url, pact_file_paths, consumer_version_params, pact_broker_client_options) }
+      subject { PublishPactsTheOldWay.new(pact_broker_base_url, pact_file_paths, consumer_version_params, options, pact_broker_client_options) }
 
       describe "call" do
         it "creates a PactBroker Client" do
@@ -85,7 +86,7 @@ module PactBroker
           end
 
           it "returns true" do
-            expect(subject.call).to be true
+            expect(subject.call.success).to eq true
           end
         end
 
@@ -140,7 +141,7 @@ module PactBroker
           end
 
           it "returns false" do
-            expect(subject.call).to be false
+            expect(subject.call.success).to be false
           end
         end
 
@@ -212,7 +213,7 @@ module PactBroker
             end
 
             it "returns false" do
-              expect(subject.call).to eq false
+              expect(subject.call.success).to eq false
             end
           end
         end
@@ -230,7 +231,7 @@ module PactBroker
           end
 
           it "returns false" do
-            expect(subject.call).to eq false
+            expect(subject.call.success).to eq false
           end
         end
 
@@ -255,7 +256,7 @@ module PactBroker
           end
 
           it "returns true" do
-            expect(subject.call).to eq true
+            expect(subject.call.success).to eq true
           end
         end
 

data/spec/lib/pact_broker/client/tasks/publication_task_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'pact_broker/client/tasks/publication_task'
 require 'pact_broker/client/publish_pacts'
+require 'pact_broker/client/command_result'
 
 module PactBroker::Client
   describe PublicationTask do
@@ -9,13 +10,16 @@ module PactBroker::Client
       @consumer_version = "1.2.3"
     end
 
-    let(:publish_pacts) { instance_double("PactBroker::ClientSupport::PublishPacts", call: true)}
+    let(:publish_pacts) { instance_double("PactBroker::ClientSupport::PublishPacts", call: result)}
     let(:pact_file_list) { ['spec/pact/consumer-provider.json'] }
+    let(:success) { true }
+    let(:result) { instance_double(PactBroker::Client::CommandResult, success: success, message: "message")}
 
     before do
       allow(PactBroker::Client::PublishPacts).to receive(:new).and_return(publish_pacts)
       allow(FileList).to receive(:[]).with(pattern).and_return(pact_file_list)
       allow(PactBroker::Client::Git).to receive(:branch).and_return('foo')
+      allow($stdout).to receive(:puts)
     end
 
     let(:pattern) { "spec/pacts/*.json" }
@@ -29,15 +33,16 @@ module PactBroker::Client
 
       context "when pacts are succesfully published" do
         it "invokes PublishPacts with the default values" do
-          expect(PactBroker::Client::PublishPacts).to receive(:new).with('http://pact-broker', pact_file_list, { number: '1.2.3', branch: "foo", tags: [], version_required: false}, {}).and_return(publish_pacts)
-          expect(publish_pacts).to receive(:call).and_return(true)
+          expect(PactBroker::Client::PublishPacts).to receive(:new).with('http://pact-broker', pact_file_list, { number: '1.2.3', branch: "foo", tags: [], version_required: false}, {}, {}).and_return(publish_pacts)
+          expect(publish_pacts).to receive(:call).and_return(result)
           Rake::Task['pact:publish'].execute
         end
       end
 
       context "when a pact fails to be published" do
+        let(:success) { false }
+
         it "raises an error" do
-          expect(publish_pacts).to receive(:call).and_return(false)
           expect { Rake::Task['pact:publish'].execute }.to raise_error("One or more pacts failed to be published")
         end
       end
@@ -52,8 +57,8 @@ module PactBroker::Client
       end
 
       it "invokes PublishPacts with the write method set" do
-        expect(PactBroker::Client::PublishPacts).to receive(:new).with('http://pact-broker', pact_file_list, { number: "1.2.3", branch: "foo", tags: [], version_required: false }, {write: :merge}).and_return(publish_pacts)
-        expect(publish_pacts).to receive(:call).and_return(true)
+        expect(PactBroker::Client::PublishPacts).to receive(:new).with('http://pact-broker', pact_file_list, { number: "1.2.3", branch: "foo", tags: [], version_required: false }, {}, {write: :merge}).and_return(publish_pacts)
+        expect(publish_pacts).to receive(:call).and_return(result)
         Rake::Task['pact:publish:merge'].execute
       end
     end
@@ -74,7 +79,7 @@ module PactBroker::Client
       end
 
       it "invokes PublishPacts with the git branch name as a tag" do
-        expect(PactBroker::Client::PublishPacts).to receive(:new).with(anything, anything, hash_including(tags: ['bar', 'foo']), anything).and_return(publish_pacts)
+        expect(PactBroker::Client::PublishPacts).to receive(:new).with(anything, anything, hash_including(tags: ['bar', 'foo']), anything, anything).and_return(publish_pacts)
         Rake::Task['pact:publish:git_branch'].execute
       end
     end
@@ -93,7 +98,7 @@ module PactBroker::Client
       end
 
       it "invokes PublishPacts with the branch name" do
-        expect(PactBroker::Client::PublishPacts).to receive(:new).with(anything, anything, hash_including(branch: "foo"), anything).and_return(publish_pacts)
+        expect(PactBroker::Client::PublishPacts).to receive(:new).with(anything, anything, hash_including(branch: "foo"), anything, anything).and_return(publish_pacts)
         Rake::Task['pact:publish:git_branch_auto_detect_true'].execute
       end
     end
@@ -113,7 +118,7 @@ module PactBroker::Client
       end
 
       it "invokes PublishPacts with the specified branch name" do
-        expect(PactBroker::Client::PublishPacts).to receive(:new).with(anything, anything, hash_including(branch: "main"), anything).and_return(publish_pacts)
+        expect(PactBroker::Client::PublishPacts).to receive(:new).with(anything, anything, hash_including(branch: "main"), anything, anything).and_return(publish_pacts)
         Rake::Task['pact:publish:git_branch_auto_detect_true_with_branch'].execute
       end
     end
@@ -132,7 +137,7 @@ module PactBroker::Client
       end
 
       it "invokes PublishPacts without the branch name" do
-        expect(PactBroker::Client::PublishPacts).to receive(:new).with(anything, anything, hash_not_including(branch: "foo"), anything).and_return(publish_pacts)
+        expect(PactBroker::Client::PublishPacts).to receive(:new).with(anything, anything, hash_not_including(branch: "foo"), anything, anything).and_return(publish_pacts)
         Rake::Task['pact:publish:git_branch_auto_detect_false'].execute
       end
     end
@@ -150,7 +155,7 @@ module PactBroker::Client
       end
 
       it "invokes PublishPacts with the branch name" do
-        expect(PactBroker::Client::PublishPacts).to receive(:new).with(anything, anything, hash_including(branch: "foo"), anything).and_return(publish_pacts)
+        expect(PactBroker::Client::PublishPacts).to receive(:new).with(anything, anything, hash_including(branch: "foo"),anything, anything).and_return(publish_pacts)
         Rake::Task['pact:publish:git_branch_auto_detect_default'].execute
       end
     end
@@ -180,9 +185,10 @@ module PactBroker::Client
           @pact_broker_base_url,
           pact_file_list,
           { number: "1.2.3", tags: [@tag], branch: "foo", version_required: false},
+          {},
           { basic_auth: @pact_broker_basic_auth, token: @pact_broker_token }
         )
-        expect(publish_pacts).to receive(:call).and_return(true)
+        expect(publish_pacts).to receive(:call).and_return(result)
         Rake::Task['pact:publish:custom'].execute
       end
     end

data/spec/lib/pact_broker/client/versions/record_deployment_spec.rb

@@ -15,14 +15,14 @@ module PactBroker
             stub_request(:get, broker_base_url).to_return(status: 200, body: index_body_hash.to_json, headers: { "Content-Type" => "application/hal+json" }  )
           end
 
-          let(:replaced_previous_deployed_version) { true }
+          let(:target) { true }
 
           let(:params) do
             {
               pacticipant_name: "Foo",
               version_number: "1",
               environment_name: "test",
-              replaced_previous_deployed_version: replaced_previous_deployed_version,
+              target: target,
               output: "text"
             }
           end
@@ -57,7 +57,7 @@ module PactBroker
             end
           end
 
-          context "when replaced_previous_deployed_version is false" do
+          context "when target is false" do
             before do
               allow_any_instance_of(RecordDeployment).to receive(:check_if_command_supported)
               allow_any_instance_of(RecordDeployment).to receive(:check_environment_exists)
@@ -65,7 +65,7 @@ module PactBroker
               allow_any_instance_of(RecordDeployment).to receive(:pact_broker_name).and_return("")
             end
 
-            let(:replaced_previous_deployed_version) { false }
+            let(:target) { false }
 
             let(:deployed_version_resource) do
               double('PactBroker::Client::Hal::Entity', response: double('response', headers: response_headers) )

data/spec/pacts/pact_broker_client-pact_broker.json

@@ -1550,6 +1550,112 @@
         }
       }
     },
+    {
+      "description": "a request for the index resource",
+      "providerState": "the pb:publish-contracts relations exists in the index resource",
+      "request": {
+        "method": "GET",
+        "path": "/",
+        "headers": {
+          "Accept": "application/hal+json"
+        }
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "Content-Type": "application/hal+json;charset=utf-8"
+        },
+        "body": {
+          "_links": {
+            "pb:publish-contracts": {
+              "href": "http://localhost:1234/HAL-REL-PLACEHOLDER-PB-PUBLISH-CONTRACTS"
+            }
+          }
+        },
+        "matchingRules": {
+          "$.body._links.pb:publish-contracts.href": {
+            "match": "regex",
+            "regex": "http:\\/\\/.*"
+          }
+        }
+      }
+    },
+    {
+      "description": "a request to publish contracts",
+      "request": {
+        "method": "POST",
+        "path": "/HAL-REL-PLACEHOLDER-PB-PUBLISH-CONTRACTS",
+        "headers": {
+          "Content-Type": "application/json",
+          "Accept": "application/hal+json"
+        },
+        "body": {
+          "pacticipantName": "Foo",
+          "pacticipantVersionNumber": "5556b8149bf8bac76bc30f50a8a2dd4c22c85f30",
+          "branch": "main",
+          "tags": [
+            "dev"
+          ],
+          "buildUrl": "http://build",
+          "contracts": [
+            {
+              "consumerName": "Foo",
+              "providerName": "Bar",
+              "specification": "pact",
+              "contentType": "application/json",
+              "content": "eyJjb25zdW1lciI6eyJuYW1lIjoiRm9vIn0sInByb3ZpZGVyIjp7Im5hbWUiOiJCYXIifSwiaW50ZXJhY3Rpb25zIjpbeyJkZXNjcmlwdGlvbiI6ImFuIGV4YW1wbGUgcmVxdWVzdCIsInByb3ZpZGVyU3RhdGUiOiJhIHByb3ZpZGVyIHN0YXRlIiwicmVxdWVzdCI6eyJtZXRob2QiOiJHRVQiLCJwYXRoIjoiLyIsImhlYWRlcnMiOnt9fSwicmVzcG9uc2UiOnsic3RhdHVzIjoyMDAsImhlYWRlcnMiOnsiQ29udGVudC1UeXBlIjoiYXBwbGljYXRpb24vaGFsK2pzb24ifX19XSwibWV0YWRhdGEiOnsicGFjdFNwZWNpZmljYXRpb24iOnsidmVyc2lvbiI6IjIuMC4wIn19fQ==",
+              "writeMode": "overwrite"
+            }
+          ]
+        }
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "Content-Type": "application/hal+json;charset=utf-8"
+        },
+        "body": {
+          "_embedded": {
+            "pacticipant": {
+              "name": "Foo"
+            },
+            "version": {
+              "number": "5556b8149bf8bac76bc30f50a8a2dd4c22c85f30",
+              "buildUrl": "http://build"
+            }
+          },
+          "logs": [
+            {
+              "level": "info",
+              "message": "some message"
+            }
+          ],
+          "_links": {
+            "pb:pacticipant-version-tags": [
+              {
+                "name": "dev"
+              }
+            ],
+            "pb:contracts": [
+              {
+                "href": "http://some-pact"
+              }
+            ]
+          }
+        },
+        "matchingRules": {
+          "$.body.logs": {
+            "min": 1
+          },
+          "$.body.logs[*].*": {
+            "match": "type"
+          },
+          "$.body._links.pb:contracts[0].href": {
+            "match": "type"
+          }
+        }
+      }
+    },
     {
       "description": "a request for the index resource",
       "providerState": "the pb:pacticipant-version and pb:environments relations exist in the index resource",