pact 1.0.6 → 1.0.7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.0.7 (11 September 2012)
+
+* Allow request query to be a Pact Term. [Seb Glazebrook]
+
 ### 1.0.6 (11 September 2012)
 
 * Made reports dir configurable [Beth Skurrie]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact (1.0.6)
+    pact (1.0.7)
       awesome_print (~> 1.1.0)
       find_a_port (~> 1.0.1)
       hashie (~> 2.0)

data/lib/pact/provider/test_methods.rb

@@ -63,7 +63,8 @@ module Pact
         path = request.path
         query = request.query
         if query && !query.empty?
-          path += "?" + request.query
+          query = query.generate if query.kind_of? Pact::Term
+          path += "?" + query
         end
         path
       end

data/lib/pact/term.rb

@@ -36,5 +36,9 @@ module Pact
       }
     end
 
+    def empty?
+      generate ? false : true
+    end
+
   end
 end

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/spec/lib/pact/provider/test_methods_spec.rb

@@ -16,5 +16,35 @@ module Pact::Provider
         expect{ subject.send(:get_provider_state, 'some state', 'consumer') }.to raise_error /Could not find.*some state.*consumer.*/
       end
     end
+
+    describe 'request path' do
+
+      let(:request) { OpenStruct.new(:path => 'path', :query => query)}
+
+      before do
+        @path = subject.send(:request_path, request)
+      end
+
+      describe 'query' do
+
+        context 'string query' do
+
+          let(:query) { 'query' }
+
+          it 'gets appended to the path' do
+            expect(@path).to eq('path?query')
+          end
+        end
+
+        context 'Term query' do
+
+          let(:query) { Pact::Term.new(generate: 'query') }
+
+          it 'appends the Term\'s generate to the path' do
+            expect(@path).to eq('path?query')
+          end
+        end
+      end
+    end
   end
 end

data/spec/lib/pact/request_spec.rb

@@ -3,6 +3,22 @@ require 'pact/request'
 
 shared_examples "a request" do
 
+  describe 'matching' do
+    let(:expected) do
+      Pact::Request::Expected.from_hash(
+        {'method' => 'get', 'path' => 'path', 'query' => /b/}
+        )
+    end
+
+    let(:actual) do
+      Pact::Request::Actual.from_hash({'method' => 'get', 'path' => 'path', 'query' => 'blah'})
+    end
+
+    it "should match" do
+      expect(expected.difference(actual)).to eq({})
+    end
+  end
+
   describe 'full_path' do
     context "with empty path" do
       subject { described_class.from_hash({:path => '', :method => 'get'}) }

data/spec/lib/pact/term_spec.rb

@@ -32,5 +32,30 @@ module Pact
       end
     end
 
+    describe 'empty?' do
+
+      subject { Term.new(generate: generate, matcher: /some matcher/) }
+
+      context 'with generate' do
+
+        let(:generate) { 'generate here'}
+
+        it 'is not empty' do
+          expect(subject).to_not be_empty
+        end
+
+      end
+
+      context 'without generate' do
+
+        let(:generate) { nil }
+
+        it 'is empty' do
+          expect(subject).to be_empty
+        end
+      end
+
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors: