pact 1.4.0.rc2 → 1.4.0.rc3

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 1.4.0.rc3 (17 October 2014)
+
+* 602906f - Upped pact-support version to allow queries specified as hashes. (bethesque, Fri Oct 17 14:30:39 2014 +1100)
+
 ### 1.4.0.rc2 (12 October 2014)
 
 * 61036fc - Updating pact-support version (bethesque, Sun Oct 12 14:39:36 2014 +1100)

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    pact (1.4.0.rc2)
+    pact (1.4.0.rc3)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json
       pact-mock_service (~> 0.0.1)
-      pact-support (~> 0.0.2)
+      pact-support (~> 0.0.3)
       rack-test (~> 0.6.2)
       randexp (~> 0.1.7)
       rspec (>= 2.14)
@@ -49,7 +49,7 @@ GEM
       term-ansicolor (~> 1.0)
       thor
       webrick
-    pact-support (0.0.2)
+    pact-support (0.0.3)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.4.0.rc2"
+  VERSION = "1.4.0.rc3"
 end

data/pact.gemspec

@@ -28,10 +28,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'webrick'
   gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
 
-  unless ENV['X_PACT_DEVELOPMENT']
-    gem.add_runtime_dependency 'pact-support', '~> 0.0.2'
-    gem.add_runtime_dependency 'pact-mock_service', '~> 0.0.1'
-  end
+  gem.add_runtime_dependency 'pact-support', '~> 0.0.3'
+  gem.add_runtime_dependency 'pact-mock_service', '~> 0.0.1'
 
   gem.add_development_dependency 'rake', '~> 10.0.3'
   gem.add_development_dependency 'webmock', '~> 1.18.0'

data/spec/integration/consumer_async_request_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+require 'pact/consumer'
+require 'pact/consumer/rspec'
+load 'pact/consumer/world.rb'
+
+describe "A service consumer side of a pact", :pact => true  do
+
+  context "with an asynchronous interaction with provider" do
+    before do
+      Pact.clear_configuration
+
+      Pact.service_consumer "Consumer" do
+        has_pact_with "Zebra Service" do
+          mock_service :zebra_service do
+            verify true
+            port 1239
+          end
+        end
+      end
+    end
+
+    it "goes like this" do
+      zebra_service.
+        given(:the_zebras_are_here).
+        upon_receiving("a retrieve Mallory request").
+      with({
+             method: :get,
+             path: '/mallory'
+      }).
+        will_respond_with({status: 200})
+
+      async_interaction { Net::HTTP.get_response(URI('http://localhost:1239/mallory')) }
+
+      zebra_service.wait_for_interactions wait_max_seconds: 1, poll_interval: 0.1
+    end
+
+    def async_interaction
+      Thread.new do
+        sleep 0.2
+        yield
+      end
+    end
+
+  end
+
+end

data/spec/integration/consumer_more_than_one_matching_interaction_spec.rb

@@ -0,0 +1,49 @@
+require 'pact/consumer'
+require 'pact/consumer/rspec'
+load 'pact/consumer/world.rb'
+
+describe "A service consumer side of a pact", :pact => true  do
+
+  context "with more than one matching interaction found" do
+    let(:expected_response) do
+      {"message"=>"Multiple interaction found for GET /path", "matching_interactions"=>[{"description"=>"a request", "request"=>{"method"=>"get", "path"=>"/path", "body"=>{"a"=>"some body"}, "headers"=>{"Content-Type"=>"application/json"}}}, {"description"=>"an identical request", "request"=>{"method"=>"get", "path"=>"/path", "body"=>{"a"=>"some body"}, "headers"=>{"Content-Type"=>"application/json"}}}]}
+    end
+
+    it "returns an error" do
+      Pact.clear_configuration
+      Pact.clear_consumer_world
+
+      Pact.service_consumer "Consumer" do
+        has_pact_with "Mary Service" do
+          mock_service :mary_service do
+            verify false
+            port 1237
+          end
+        end
+      end
+
+      mary_service
+      .given("something")
+      .upon_receiving("a request")
+      .with(method: 'get', path: '/path', body: {a: 'some body'}, headers: {'Content-Type' => 'application/json'})
+      .will_respond_with(status: 200)
+
+
+      mary_service
+      .upon_receiving("an identical request")
+      .with(method: 'get', path: '/path', body: {a: 'some body'}, headers: {'Content-Type' => 'application/json'})
+      .will_respond_with(status: 200)
+
+      uri = URI('http://localhost:1237/path')
+      post_req = Net::HTTP::Get.new(uri.path)
+      post_req['Content-Type'] = "application/json"
+      post_req.body = {a: "some body"}.to_json
+      response = Net::HTTP.start(uri.hostname, uri.port) do |http|
+        http.request post_req
+      end
+
+      expect(JSON.load(response.body)).to eq expected_response
+    end
+
+  end
+end

data/spec/integration/consumer_no_matching_interaction_spec.rb

@@ -0,0 +1,53 @@
+require 'pact/consumer'
+require 'pact/consumer/rspec'
+load 'pact/consumer/world.rb'
+
+describe "A service consumer side of a pact", :pact => true  do
+  context "with no matching interaction found" do
+
+    let(:expected_response) do
+      {
+        "message"=>"No interaction found for GET /path",
+        "interaction_diffs"=>[{
+                                "description" => "a request that will not be properly matched",
+                                "provider_state" => "something",
+                                "body"=>{
+                                  "a"=>{
+                                    "EXPECTED"=>"some body",
+                                    "ACTUAL"=>"not matching body"
+                                  }
+                                }
+        }]
+      }
+    end
+
+    it "returns an error" do
+      Pact.clear_configuration
+
+      Pact.service_consumer "Consumer" do
+        has_pact_with "Mary Service" do
+          mock_service :mary_service do
+            verify false
+            port 1236
+          end
+        end
+      end
+
+      mary_service
+      .given("something")
+      .upon_receiving("a request that will not be properly matched")
+      .with(method: 'get', path: '/path', body: {a: 'some body'}, headers: {'Content-Type' => 'application/json'})
+      .will_respond_with(status: 200)
+
+      uri = URI('http://localhost:1236/path')
+      post_req = Net::HTTP::Get.new(uri.path)
+      post_req['Content-Type'] = "application/json"
+      post_req.body = {a: "not matching body"}.to_json
+      response = Net::HTTP.start(uri.hostname, uri.port) do |http|
+        http.request post_req
+      end
+
+      expect(JSON.load(response.body)).to eq expected_response
+    end
+  end
+end

data/spec/integration/consumer_with_a_provider_state_spec.rb

@@ -0,0 +1,44 @@
+require 'pact/consumer'
+require 'pact/consumer/rspec'
+load 'pact/consumer/world.rb'
+require 'faraday'
+
+describe "A service consumer side of a pact", :pact => true  do
+  context "with a provider state" do
+    before do
+      Pact.clear_configuration
+
+      Pact.service_consumer "Consumer" do
+        has_pact_with "Zebra Service" do
+          mock_service :zebra_service do
+            verify false
+            port 1235
+          end
+        end
+      end
+    end
+
+    let(:body) { 'That is some good Mallory.' }
+
+    it "goes like this" do
+      zebra_service.
+        given(:the_zebras_are_here).
+      upon_receiving("a retrieve Mallory request").with({
+                                                          method: :get,
+                                                          path: '/mallory',
+                                                          headers: {'Accept' => 'text/html'}
+      }).
+      will_respond_with({
+                          status: 200,
+                          headers: { 'Content-Type' => 'text/html' },
+                          body: Pact::Term.new(matcher: /Mallory/, generate: body)
+      })
+
+      response = Faraday.get(zebra_service.mock_service_base_url + "/mallory", nil, {'Accept' => 'text/html'})
+      expect(response.body).to eq body
+
+      interactions = Pact::ConsumerContract.from_json(zebra_service.write_pact).interactions
+      expect(interactions.first.provider_state).to eq("the_zebras_are_here")
+    end
+  end
+end

data/spec/integration/consumer_with_params_hash_spec.rb

@@ -0,0 +1,111 @@
+require 'spec_helper'
+require 'net/http'
+require 'pact/consumer'
+require 'pact/consumer/rspec'
+require 'faraday'
+load 'pact/consumer/world.rb'
+
+describe "A service consumer side of a pact", :pact => true  do
+
+  # Helper to make Faraday requests.
+  # Faraday::FlatParamsEncoder may only be needed with our current version of Faraday 0.9
+  # and ensures that when there are multiple parameters of the same name, they are encoded properly. e.g. colour=blue&colour=green
+  def faraday_mallory(base_url,params)
+    (Faraday.new base_url, :request => {
+       :params_encoder => Faraday::FlatParamsEncoder,
+    }).get '/mallory', params, {'Accept' => 'application/json'}
+  end
+
+  let(:body) { 'That is some good Mallory.' }
+
+  context 'When expecting multiple instances of the same parameter in the query' do
+
+    before :all do
+      Pact.clear_configuration
+
+      Pact.service_consumer "Consumer" do
+        has_pact_with "Zebra Service" do
+          mock_service :zebra_service2 do
+            verify false
+            port 1241
+          end
+        end
+      end
+    end
+
+    before do
+
+      zebra_service2.
+        given(:the_zebras_are_here).
+        upon_receiving("a retrieve Mallory request").with({
+          method: :get,
+          path: '/mallory',
+          headers: {'Accept' => 'application/json'},
+          query: {colour: 'brown', size: ['small', 'large']}
+        }).
+        will_respond_with({
+          status: 200,
+          headers: { 'Content-Type' => 'application/json' },
+          body: Pact::Term.new(matcher: /Mallory/, generate: body)
+      })
+
+    end
+
+    it "matches when all instances are provided" do
+      response= faraday_mallory(zebra_service2.mock_service_base_url, { size: ['small','large'], colour: 'brown'})
+      expect(response.body).to eq body
+
+      interactions = Pact::ConsumerContract.from_json(zebra_service2.write_pact).interactions
+      expect(interactions.first.provider_state).to eq("the_zebras_are_here")
+    end
+
+    it "does not match when only the first instance is provided" do
+      response = Faraday.get(zebra_service2.mock_service_base_url + "/mallory?colour=brown&size=small", nil, {'Accept' => 'application/json'})
+      expect(response.body).not_to eq body
+    end
+
+    it "does not match when only the last instance is provided" do
+      response = Faraday.get(zebra_service2.mock_service_base_url + "/mallory?colour=brown&size=large", nil, {'Accept' => 'application/json'})
+      expect(response.body).not_to eq body
+    end
+
+    it "does not match when they are out of order" do
+      response= faraday_mallory(zebra_service2.mock_service_base_url, { size: ['large','small'], colour: 'brown'})
+      expect(response.body).not_to eq body
+    end
+  end
+
+  context "and a complex request matching Pact Terms and multiple instances of the same parameter" do
+
+    it "goes like this" do
+      Pact.clear_configuration
+      Pact.service_consumer "Consumer" do
+        has_pact_with "Zebra Service" do
+          mock_service :zebra_service do
+            verify false
+            port 1242
+          end
+        end
+      end
+      zebra_service.
+        given(:the_zebras_are_here).
+        upon_receiving("a retrieve Mallory request").
+        with({
+           method: :get,
+           path: '/mallory',
+           headers: {'Accept' => 'application/json'},
+           query: { size: ['small',Pact::Term.new(matcher: /med.*/, generate: 'medium'),'large'], colour: 'brown', weight: '5'}
+        }).
+        will_respond_with({
+          status: 200,
+          headers: { 'Content-Type' => 'application/json' },
+          body: Pact::Term.new(matcher: /Mallory/, generate: body)
+      })
+      response = faraday_mallory(zebra_service.mock_service_base_url, { weight: 5, size: ['small','medium','large'], colour: 'brown'})
+      expect(response.body).to eq body
+
+      interactions = Pact::ConsumerContract.from_json(zebra_service.write_pact).interactions
+      expect(interactions.first.provider_state).to eq("the_zebras_are_here")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc2
+  version: 1.4.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-12 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: pact-mock_service
   requirement: !ruby/object:Gem::Requirement
@@ -419,7 +419,11 @@ files:
 - spec/features/consumption_spec.rb
 - spec/features/production_spec.rb
 - spec/features/provider_states/zebras.rb
-- spec/integration/consumer_spec.rb
+- spec/integration/consumer_async_request_spec.rb
+- spec/integration/consumer_more_than_one_matching_interaction_spec.rb
+- spec/integration/consumer_no_matching_interaction_spec.rb
+- spec/integration/consumer_with_a_provider_state_spec.rb
+- spec/integration/consumer_with_params_hash_spec.rb
 - spec/integration/pact/consumer_configuration_spec.rb
 - spec/integration/pact/provider_configuration_spec.rb
 - spec/lib/pact/cli_spec.rb
@@ -507,7 +511,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2508150550724999576
+      hash: 2688969630931365840
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -526,7 +530,11 @@ test_files:
 - spec/features/consumption_spec.rb
 - spec/features/production_spec.rb
 - spec/features/provider_states/zebras.rb
-- spec/integration/consumer_spec.rb
+- spec/integration/consumer_async_request_spec.rb
+- spec/integration/consumer_more_than_one_matching_interaction_spec.rb
+- spec/integration/consumer_no_matching_interaction_spec.rb
+- spec/integration/consumer_with_a_provider_state_spec.rb
+- spec/integration/consumer_with_params_hash_spec.rb
 - spec/integration/pact/consumer_configuration_spec.rb
 - spec/integration/pact/provider_configuration_spec.rb
 - spec/lib/pact/cli_spec.rb

data/spec/integration/consumer_spec.rb

@@ -1,212 +0,0 @@
-require 'spec_helper'
-require 'net/http'
-require 'pact/consumer'
-require 'pact/consumer/rspec'
-require 'faraday'
-load 'pact/consumer/world.rb'
-
-describe "A service consumer side of a pact", :pact => true  do
-
-  context "with more than one matching interaction found" do
-    let(:expected_response) do
-      {"message"=>"Multiple interaction found for GET /path", "matching_interactions"=>[{"description"=>"a request", "request"=>{"method"=>"get", "path"=>"/path", "body"=>{"a"=>"some body"}, "headers"=>{"Content-Type"=>"application/json"}}}, {"description"=>"an identical request", "request"=>{"method"=>"get", "path"=>"/path", "body"=>{"a"=>"some body"}, "headers"=>{"Content-Type"=>"application/json"}}}]}
-    end
-
-    it "returns an error" do
-      Pact.clear_configuration
-      Pact.clear_consumer_world
-
-      Pact.service_consumer "Consumer" do
-        has_pact_with "Mary Service" do
-          mock_service :mary_service do
-            verify false
-            port 1237
-          end
-        end
-      end
-
-      mary_service
-        .given("something")
-        .upon_receiving("a request")
-        .with(method: 'get', path: '/path', body: {a: 'some body'}, headers: {'Content-Type' => 'application/json'})
-        .will_respond_with(status: 200)
-
-
-      mary_service
-        .upon_receiving("an identical request")
-        .with(method: 'get', path: '/path', body: {a: 'some body'}, headers: {'Content-Type' => 'application/json'})
-        .will_respond_with(status: 200)
-
-      uri = URI('http://localhost:1237/path')
-      post_req = Net::HTTP::Get.new(uri.path)
-      post_req['Content-Type'] = "application/json"
-      post_req.body = {a: "some body"}.to_json
-      response = Net::HTTP.start(uri.hostname, uri.port) do |http|
-        http.request post_req
-      end
-
-      expect(JSON.load(response.body)).to eq expected_response
-    end
-
-  end
-
-  context "with no matching interaction found" do
-
-    let(:expected_response) do
-      {
-        "message"=>"No interaction found for GET /path",
-        "interaction_diffs"=>[{
-          "description" => "a request that will not be properly matched",
-          "provider_state" => "something",
-          "body"=>{
-            "a"=>{
-              "EXPECTED"=>"some body",
-              "ACTUAL"=>"not matching body"
-            }
-          }
-        }]
-      }
-    end
-
-    it "returns an error" do
-      Pact.clear_configuration
-
-      Pact.service_consumer "Consumer" do
-        has_pact_with "Mary Service" do
-          mock_service :mary_service do
-            verify false
-            port 1236
-          end
-        end
-      end
-
-      mary_service
-        .given("something")
-        .upon_receiving("a request that will not be properly matched")
-        .with(method: 'get', path: '/path', body: {a: 'some body'}, headers: {'Content-Type' => 'application/json'})
-        .will_respond_with(status: 200)
-
-      uri = URI('http://localhost:1236/path')
-      post_req = Net::HTTP::Get.new(uri.path)
-      post_req['Content-Type'] = "application/json"
-      post_req.body = {a: "not matching body"}.to_json
-      response = Net::HTTP.start(uri.hostname, uri.port) do |http|
-        http.request post_req
-      end
-
-      expect(JSON.load(response.body)).to eq expected_response
-    end
-  end
-
-  context "with a provider state" do
-    before do
-      Pact.clear_configuration
-
-      Pact.service_consumer "Consumer" do
-        has_pact_with "Zebra Service" do
-          mock_service :zebra_service do
-            verify false
-            port 1235
-          end
-        end
-      end
-    end
-
-    let(:body) { 'That is some good Mallory.' }
-
-    it "goes like this" do
-      zebra_service.
-        given(:the_zebras_are_here).
-        upon_receiving("a retrieve Mallory request").with({
-          method: :get,
-          path: '/mallory',
-          headers: {'Accept' => 'text/html'}
-        }).
-        will_respond_with({
-          status: 200,
-          headers: { 'Content-Type' => 'text/html' },
-          body: Pact::Term.new(matcher: /Mallory/, generate: body)
-        })
-
-      response = Faraday.get(zebra_service.mock_service_base_url + "/mallory", nil, {'Accept' => 'text/html'})
-      expect(response.body).to eq body
-
-      interactions = Pact::ConsumerContract.from_json(zebra_service.write_pact).interactions
-      expect(interactions.first.provider_state).to eq("the_zebras_are_here")
-    end
-  end
-
-  context "with multiple headers" do
-    before do
-      Pact.clear_configuration
-      Pact.service_consumer "Consumer" do
-        has_pact_with "Multi Headers Service" do
-          mock_service :multi_headers_service do
-            verify true
-            port 1240
-          end
-        end
-      end
-
-      multi_headers_service.
-        given("there are multiple headers").
-        upon_receiving("a request with multiple headers").
-        with(method: :get, path: '/something', headers: {'X-Something' => "1, 2"}).
-        will_respond_with(status: 200)
-
-        uri = URI('http://localhost:1240/something')
-        post_req = Net::HTTP::Get.new(uri.path)
-        post_req.add_field('X-Something', '1')
-        post_req.add_field('X-Something', '2')
-        response = Net::HTTP.start(uri.hostname, uri.port) do |http|
-          http.request post_req
-        end
-    end
-
-    it "handles multiple headers with the same name in a comma separated list" do
-      interactions = Pact::ConsumerContract.from_json(multi_headers_service.write_pact).interactions
-      expect(interactions.first.request.headers['X-Something']).to eq("1, 2")
-    end
-
-  end
-
-  context "with a async interaction with provider" do
-    before do
-      Pact.clear_configuration
-
-      Pact.service_consumer "Consumer" do
-        has_pact_with "Zebra Service" do
-          mock_service :zebra_service do
-            verify true
-            port 1239
-          end
-        end
-      end
-    end
-
-    it "goes like this" do
-      zebra_service.
-          given(:the_zebras_are_here).
-          upon_receiving("a retrieve Mallory request").
-          with({
-            method: :get,
-            path: '/mallory'
-          }).
-          will_respond_with({status: 200})
-
-      async_interaction { Net::HTTP.get_response(URI('http://localhost:1239/mallory'))}
-
-      zebra_service.wait_for_interactions wait_max_seconds: 1, poll_interval: 0.1
-    end
-
-    def async_interaction
-      Thread.new do
-        sleep 0.2
-        yield
-      end
-    end
-
-  end
-
-end
-