pact_broker-client 1.38.1 → 1.41.0

data/spec/lib/pact_broker/client/cli/broker_publish_spec.rb

@@ -6,11 +6,14 @@ module PactBroker::Client::CLI
   describe Broker do
     describe ".broker" do
       before do
-        allow(PactBroker::Client::PublishPacts).to receive(:call).and_return(true)
+        allow(PactBroker::Client::PublishPacts).to receive(:call).and_return(result)
         allow(PactBroker::Client::Git).to receive(:branch).and_return("bar")
         subject.options = OpenStruct.new(minimum_valid_options)
+        allow($stdout).to receive(:puts)
       end
 
+      let(:success) { true }
+      let(:result) { instance_double(PactBroker::Client::CommandResult, success: success, message: "message")}
       let(:file_list) { ["spec/support/cli_test_pacts/foo.json"] }
       let(:minimum_valid_options) do
         {
@@ -28,7 +31,8 @@ module PactBroker::Client::CLI
             "http://pact-broker",
             ["spec/support/cli_test_pacts/foo.json"],
             { number: "1.2.3", tags: [], version_required: false },
-            { }
+            {},
+            {}
           )
           invoke_broker
         end
@@ -42,6 +46,7 @@ module PactBroker::Client::CLI
             anything,
             ["spec/support/cli_test_pacts/bar.json", "spec/support/cli_test_pacts/foo.json"],
             anything,
+            anything,
             anything
           )
           invoke_broker
@@ -56,6 +61,7 @@ module PactBroker::Client::CLI
             anything,
             ["spec/support/cli_test_pacts/bar.json", "spec/support/cli_test_pacts/foo.json"],
             anything,
+            anything,
             anything
           )
           invoke_broker
@@ -70,12 +76,29 @@ module PactBroker::Client::CLI
             anything,
             ["spec/support/cli_test_pacts/bar.json", "spec/support/cli_test_pacts/foo.json"],
             anything,
+            anything,
             anything
           )
           invoke_broker
         end
       end
 
+      context "with an invalid argument specified that gets interpreted as a path" do
+        let(:file_list) { ['--wrong'] }
+
+        it "raises a more helpful error" do
+          expect{ invoke_broker }.to raise_error(Thor::Error, 'ERROR: pact-broker publish was called with invalid arguments ["--wrong"]')
+        end
+      end
+
+      context "when a specified file does not exist" do
+        let(:file_list) { ['no-existy'] }
+
+        it "raises a more helpful error" do
+          expect{ invoke_broker }.to raise_error(Thor::Error, /Specified pact file 'no-existy' does not exist/)
+        end
+      end
+
       context "with a tag" do
         before do
           subject.options = OpenStruct.new(minimum_valid_options.merge(tag: ['foo']))
@@ -86,6 +109,7 @@ module PactBroker::Client::CLI
             anything,
             anything,
             hash_including(tags: ['foo']),
+            anything,
             anything
           )
           invoke_broker
@@ -109,6 +133,7 @@ module PactBroker::Client::CLI
             anything,
             anything,
             hash_including(tags: ['foo', 'bar']),
+            anything,
             anything
           )
           invoke_broker
@@ -127,6 +152,7 @@ module PactBroker::Client::CLI
             anything,
             anything,
             hash_including(branch: "main", version_required: true),
+            anything,
             anything
           )
           invoke_broker
@@ -151,6 +177,7 @@ module PactBroker::Client::CLI
             anything,
             anything,
             hash_including(branch: "bar", version_required: false),
+            anything,
             anything
           )
           invoke_broker
@@ -176,6 +203,7 @@ module PactBroker::Client::CLI
             anything,
             anything,
             hash_including(branch: "bar", version_required: true),
+            anything,
             anything
           )
           invoke_broker
@@ -193,6 +221,7 @@ module PactBroker::Client::CLI
               anything,
               anything,
               hash_including(branch: "specified-branch", version_required: true),
+              anything,
               anything
             )
             invoke_broker
@@ -212,6 +241,7 @@ module PactBroker::Client::CLI
             anything,
             anything,
             hash_including(build_url: "http://ci"),
+            anything,
             anything
           )
           invoke_broker
@@ -230,6 +260,7 @@ module PactBroker::Client::CLI
             anything,
             anything,
             anything,
+            anything,
             hash_including(basic_auth: { username: 'foo', password: 'bar' })
           )
           invoke_broker
@@ -267,12 +298,10 @@ module PactBroker::Client::CLI
       end
 
       context "when the publish command is not successful" do
-        before do
-          allow(PactBroker::Client::PublishPacts).to receive(:call).and_return(false)
-        end
+        let(:success) { false }
 
-        it "raises a PactPublicationError" do
-          expect { invoke_broker }.to raise_error PactPublicationError
+        it "raises a SystemExit" do
+          expect { invoke_broker }.to raise_error SystemExit
         end
       end
     end

data/spec/lib/pact_broker/client/cli/version_selector_options_parser_spec.rb

@@ -48,6 +48,27 @@ module PactBroker
           ],[
             ["--pacticipant", "Foo=Bar", "--version", "1.2.3"],
             [{ pacticipant: "Foo=Bar", version: "1.2.3" } ]
+          ],[
+            ["--ignore", "Foo", "--version", "1.2.3"],
+            [{ pacticipant: "Foo", version: "1.2.3", ignore: true }]
+          ],[
+            ["--ignore", "Foo", "--ignore", "Bar", "--version", "1.2.3"],
+            [{ pacticipant: "Foo", ignore: true }, { pacticipant: "Bar", version: "1.2.3", ignore: true }]
+          ],[
+            ["--ignore", "Foo", "--pacticipant", "Bar", "--version", "1.2.3"],
+            [{ pacticipant: "Foo", ignore: true }, { pacticipant: "Bar", version: "1.2.3" }]
+          ],[
+            ["--pacticipant", "Foo", "--version", "1", "--version", "2"],
+            [{ pacticipant: "Foo", version: "2" }]
+          ],[
+            ["--pacticipant", "Foo", "--version", "2", "--latest"],
+            [{ pacticipant: "Foo", version: "2", latest: true }]
+          ],[
+            ["--pacticipant", "Foo", "--version", "2", "--latest", "--latest"],
+            [{ pacticipant: "Foo", version: "2", latest: true }]
+          ],[
+            ["--version", "2"],
+            [{ pacticipant: nil, version: "2" }]
           ]
         ]
 

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