pact_broker 2.19.2 → 2.20.0

data/spec/lib/pact_broker/webhooks/check_host_whitelist_spec.rb

@@ -0,0 +1,47 @@
+require 'pact_broker/webhooks/check_host_whitelist'
+
+module PactBroker
+  module Webhooks
+    describe CheckHostWhitelist do
+      context "when the host is 10.0.0.7" do
+        let(:host) { "10.0.1.0" }
+
+        it "matches 10.0.0.0/8" do
+          expect(CheckHostWhitelist.call(host, ["10.0.0.0/8"])).to eq ["10.0.0.0/8"]
+        end
+
+        it "matches 10.0.1.0" do
+          expect(CheckHostWhitelist.call(host, [host])).to eq [host]
+        end
+
+        it "does not match 10.0.0.2" do
+          expect(CheckHostWhitelist.call(host, ["10.0.0.2"])).to eq []
+        end
+
+        it "does not match 10.0.0.0/28" do
+          expect(CheckHostWhitelist.call(host, ["10.0.0.0/28"])).to eq []
+        end
+      end
+
+      context "when the host is localhost" do
+        let(:host) { "localhost" }
+
+        it "matches localhost" do
+          expect(CheckHostWhitelist.call(host, [host])).to eq [host]
+        end
+
+        it "matches /local.*/" do
+          expect(CheckHostWhitelist.call(host, [/local*/])).to eq [/local*/]
+        end
+
+        it "does not match foo" do
+          expect(CheckHostWhitelist.call(host, ["foo"])).to eq []
+        end
+
+        it "does not match /foo.*/" do
+          expect(CheckHostWhitelist.call(host, [/foo*/])).to eq []
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/webhooks/render_spec.rb

@@ -0,0 +1,36 @@
+require 'pact_broker/webhooks/render'
+require 'cgi'
+
+module PactBroker
+  module Webhooks
+    describe Render do
+      describe "#call" do
+        before do
+          allow(PactBroker::Api::PactBrokerUrls).to receive(:pact_url).and_return("http://foo")
+        end
+
+        let(:body) do
+          "Foo ${pactbroker.pactUrl} ${pactbroker.consumerVersionNumber}"
+        end
+
+        let(:pact) do
+          instance_double("pact", consumer_version_number: "1.2.3+foo")
+        end
+
+        subject { Render.call(body, pact, nil) }
+
+        it { is_expected.to eq "Foo http://foo 1.2.3+foo" }
+
+        context "with an escaper" do
+          subject do
+            Render.call(body, pact, nil) do | value |
+              CGI.escape(value)
+            end
+          end
+
+          it { is_expected.to eq "Foo http%3A%2F%2Ffoo 1.2.3%2Bfoo" }
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/webhooks/service_spec.rb

@@ -102,6 +102,13 @@ module PactBroker
 
         subject { PactBroker::Webhooks::Service.execute_webhook_now td.webhook, pact }
 
+        it "executes the triggered webhook with the correct options" do
+          allow(PactBroker.configuration).to receive(:show_webhook_response?).and_return('foo')
+          expected_options = { :failure_log_message => "Webhook execution failed", :show_response => 'foo' }
+          expect_any_instance_of(PactBroker::Webhooks::TriggeredWebhook).to receive(:execute).with(expected_options).and_call_original
+          subject
+        end
+
         it "executes the HTTP request of the webhook" do
           subject
           expect(http_request).to have_been_made

data/spec/support/shared_examples_for_responses.rb

@@ -24,14 +24,14 @@ end
 
 RSpec::Matchers.define :be_a_json_response do
   match do | actual |
-    expect(actual.headers['Content-Type']).to eq 'application/json;charset=utf-8'
+    expect(actual.headers['Content-Type']).to eq 'application/hal+json;charset=utf-8'
   end
 end
 
 RSpec::Matchers.define :be_a_json_error_response do | message |
   match do | actual |
     expect(actual.status).to be 400
-    expect(actual.headers['Content-Type']).to eq 'application/json;charset=utf-8'
+    expect(actual.headers['Content-Type']).to eq 'application/hal+json;charset=utf-8'
     expect(actual.body).to include message
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.19.2
+  version: 2.20.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -887,10 +887,12 @@ files:
 - lib/pact_broker/versions/parse_semantic_version.rb
 - lib/pact_broker/versions/repository.rb
 - lib/pact_broker/versions/service.rb
+- lib/pact_broker/webhooks/check_host_whitelist.rb
 - lib/pact_broker/webhooks/execution.rb
 - lib/pact_broker/webhooks/job.rb
 - lib/pact_broker/webhooks/latest_triggered_webhook.rb
 - lib/pact_broker/webhooks/redact_logs.rb
+- lib/pact_broker/webhooks/render.rb
 - lib/pact_broker/webhooks/repository.rb
 - lib/pact_broker/webhooks/service.rb
 - lib/pact_broker/webhooks/status.rb
@@ -1144,8 +1146,10 @@ files:
 - spec/lib/pact_broker/versions/parse_semantic_version_spec.rb
 - spec/lib/pact_broker/versions/repository_spec.rb
 - spec/lib/pact_broker/versions/service_spec.rb
+- spec/lib/pact_broker/webhooks/check_host_whitelist_spec.rb
 - spec/lib/pact_broker/webhooks/job_spec.rb
 - spec/lib/pact_broker/webhooks/redact_logs_spec.rb
+- spec/lib/pact_broker/webhooks/render_spec.rb
 - spec/lib/pact_broker/webhooks/repository_spec.rb
 - spec/lib/pact_broker/webhooks/service_spec.rb
 - spec/lib/pact_broker/webhooks/status_spec.rb
@@ -1433,8 +1437,10 @@ test_files:
 - spec/lib/pact_broker/versions/parse_semantic_version_spec.rb
 - spec/lib/pact_broker/versions/repository_spec.rb
 - spec/lib/pact_broker/versions/service_spec.rb
+- spec/lib/pact_broker/webhooks/check_host_whitelist_spec.rb
 - spec/lib/pact_broker/webhooks/job_spec.rb
 - spec/lib/pact_broker/webhooks/redact_logs_spec.rb
+- spec/lib/pact_broker/webhooks/render_spec.rb
 - spec/lib/pact_broker/webhooks/repository_spec.rb
 - spec/lib/pact_broker/webhooks/service_spec.rb
 - spec/lib/pact_broker/webhooks/status_spec.rb