pact_broker 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f09781dc3499bf4830479db69b58d8d26436bea
-  data.tar.gz: 74c433ce40b144bd5e2c1cef5efa4a3d892a94f5
+  metadata.gz: a2e789a7f93e0c406d9a7fddda930d8a226098aa
+  data.tar.gz: 17f764538b78147ee4c2a7fe7546e799b58bd98e
 SHA512:
-  metadata.gz: 85c3c79444957b05bcfd754e5d12b69a2d8196439a45e1f6ce1edaf2d2936e850f9656bbb3396d243434bd80a11a659a257b2614b10385c52e5a07b7b14fcfa1
-  data.tar.gz: 78782d8518d1bf357c9d434b5ed40d77d6ab83f6f73745e063f22a2f5c747e61f65201af92851206c4b70cdab532d6d51a5d05a8d72cfbd25dfec0834723d80c
+  metadata.gz: 786b010b045b1b380f67eceeb0e5a0dbf4689d3daeb52a1445cd9d0cbca7462ce1a219fc39fd47d17da41c631e479690be99f2be051a49fff1d5aa8ab22a8caa
+  data.tar.gz: 2d6b77c90a5ac7d27b7034dd065ebc7dc8005ec4f008010c75434e73ce93d687416238fd17a8971bfd18b439813208516f0b1a26e4d6ebae116fcbc7253ae7e8

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
+  - 2.1.10
+  - 2.2.5
   - 2.3.1

data/CHANGELOG.md

@@ -2,6 +2,8 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+#### 1.11.1 (2016-10-13)
+* 14381ac - Fix issue #59 Error when executing web hook with body. (Beth Skurrie, Thu Oct 13 12:50:17 2016 +1100)
 
 #### 1.11.0 (2016-08-13)
 * 18ffc4a - Add conflict guards to pact merger (Steve Pletcher, Fri Aug 5 12:31:30 2016 -0400)

data/RELEASING.md

@@ -8,6 +8,7 @@
 3. Add files to git
 
       $ git add CHANGELOG.md lib/pact_broker/version.rb
+      $ git commit -m "Releasing version X.Y.Z"
 
 3. Release:
 

data/config.ru

@@ -5,7 +5,7 @@ require 'rack/hal_browser'
 require 'pact_broker/ui/controllers/relationships'
 
 
-use Rack::Static, :urls => ["/stylesheets", "/css", "/fonts", "/js", "/javascripts"], :root => "public"
+use Rack::Static, :urls => ["/stylesheets", "/css", "/fonts", "/js", "/javascripts", "/images"], :root => "public"
 use Rack::HalBrowser::Redirect, :exclude => ['/diagnostic', '/trace','/index']
 
 run Rack::URLMap.new(

data/lib/pact_broker/domain/webhook_request.rb

@@ -56,7 +56,13 @@ module PactBroker
 
           req.basic_auth(username, password) if username
 
-          req.body = body
+          unless body.nil?
+            if String === body
+              req.body = body
+            else
+              req.body = body.to_json
+            end
+          end
 
           logger.info "Making webhook request #{to_s}"
           response = Net::HTTP.start(uri.hostname, uri.port,

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '1.11.0'
+  VERSION = '1.11.1'
 end

data/spec/lib/pact_broker/domain/webhook_request_spec.rb

@@ -11,6 +11,7 @@ module PactBroker
       let(:username) { nil }
       let(:password) { nil }
       let(:url) { 'http://example.org/hook' }
+      let(:body) { 'body' }
 
       subject do
         WebhookRequest.new(
@@ -19,7 +20,7 @@ module PactBroker
           headers: {'Content-type' => 'text/plain'},
           username: username,
           password: password,
-          body: 'body')
+          body: body)
       end
 
       describe "description" do
@@ -103,6 +104,36 @@ module PactBroker
           end
         end
 
+        context "when the request has a JSONable body" do
+          let(:body) { [{"some": "json"}] }
+
+          let!(:http_request) do
+            stub_request(:post, "http://example.org/hook").
+              with(:headers => {'Content-Type'=>'text/plain'}, :body => body.to_json).
+              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/plain, blah'})
+          end
+
+          it "converts the body to JSON before submitting the request" do
+            subject.execute
+            expect(http_request).to have_been_made
+          end
+        end
+
+        context "when the request has a nil body" do
+          let(:body) { nil }
+
+          let!(:http_request) do
+            stub_request(:post, "http://example.org/hook").
+              with(:headers => {'Content-Type'=>'text/plain'}, :body => nil).
+              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/plain, blah'})
+          end
+
+          it "executes the request without a body" do
+            subject.execute
+            expect(http_request).to have_been_made
+          end
+        end
+
         context "when the request is successful" do
           it "returns a WebhookExecutionResult with success=true" do
             expect(subject.execute.success?).to be true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty