pact-support 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d30e4cc422b899773c2917361c59ad211792f922
-  data.tar.gz: e20e3a998c5ba7f018b615567718193e009bcd26
+  metadata.gz: a641a88b589e629a6991b1d4f03486bbf25457c8
+  data.tar.gz: bfe932a2a9ea158088c848ddeda4eeb02d0d55dd
 SHA512:
-  metadata.gz: 3e8e7a5188f514b4c5b47de5e3a5005f863544b1625a8bf932a84ac6a700b8d5926ef87c7bfd35dbe56b7c3579ba7793d9704a64f8eae4592c73b2408696316c
-  data.tar.gz: 095ec74b09b3ffa4bce8212d495eb88d93ee69723997d58c2d836be356493fed9bf1b17f0a4e5150f81845cdc67fdf8639598ca5ea9c1e0f9e982bfd5627bfde
+  metadata.gz: 5c219a9254a8eb62cc3c3c2216dcc83e734acf4ff04bdd17f96670fa6f1d3ed7cc372d14154acda42719a4c3e142e38acd24b441d762256919009a801e6a4168
+  data.tar.gz: 7ff96f3a742321247936a84fca00c2f33065f2558d8bafa4126981be51d96403e52988fa59576979bef0e12b82f5239a76699169e14717bf253c6b8e17934f23

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 0.3.1 (24 Februrary 2015)
+
+* e3d6d6d - Fixed bug when Content-Type is a Pact::Term. (Beth Skurrie, Tue Feb 24 17:25:10 2015 +1100)
+
 ### 0.3.0 (13 Februrary 2015)
 
 * 4e29277 - Create a public API for extracting matching rules for pact-mock_service to use. (Beth Skurrie, Fri Feb 13 15:35:14 2015 +1100)

data/lib/pact/shared/request.rb

@@ -42,8 +42,8 @@ module Pact
       end
 
       def content_type
-        return nil unless specified?(:headers)
-        headers['Content-Type']
+        return nil unless specified?(:headers) && headers['Content-Type']
+        Pact::Reification.from_term(headers['Content-Type'])
       end
 
       def content_type? content_type

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/spec/lib/pact/consumer_contract/request_spec.rb

@@ -69,6 +69,17 @@ module Pact
         expect(subject.matches? actual_request).to be true
       end
 
+      context "when the Content-Type header is a Pact::Term" do
+        let(:expected_headers) { {'Content-Type' => Pact::Term.new(generate: 'application/json', matcher: /json/) } }
+        let(:expected_body) { {'foo' => 'bar'} }
+        let(:actual_headers) { {'Content-Type' => 'foo/json'} }
+        let(:actual_body) { {'foo' => 'bar'} }
+
+        it "reifies the term before matching" do
+          expect(subject.matches? actual_request).to be true
+        end
+      end
+
       context "when the methods are the same but one is symbolized" do
         let(:expected_method) { :get }
         let(:actual_method) { 'get' }

data/spec/lib/pact/shared/request_spec.rb

@@ -104,16 +104,28 @@ module Pact
         end
         context "when there is no Content-Type header" do
           let(:headers) { {} }
-          it "returns the content-type" do
+          it "returns nil" do
             expect(subject.send(:content_type)).to be nil
           end
         end
-        context "when there is a content-type header (" do
+        context "when there is a Content-Type header" do
+          let(:headers) { {'Content-Type' => 'blah'} }
+          it "returns the Content-Type" do
+            expect(subject.send(:content_type)).to eq 'blah'
+          end
+        end
+        context "when there is a content-type header" do
           let(:headers) { {'content-type' => 'blah'} }
           it "returns the content-type" do
             expect(subject.send(:content_type)).to eq 'blah'
           end
         end
+        context "when the Content-Type header is a Pact::Term" do
+          let(:headers) { {'Content-Type' => Pact::Term.new(generate: 'application/json', matcher: /json/)} }
+          it "returns the reified Content-Type" do
+            expect(subject.send(:content_type)).to eq 'application/json'
+          end
+        end
       end
 
       describe "content_type?" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp