pact 1.0.9 → 1.0.10

data/pact.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.add_runtime_dependency 'randexp', '~> 0.1.7'
-  gem.add_runtime_dependency 'hashie', '~> 2.0'
   gem.add_runtime_dependency 'rspec', '~> 2.12'
   gem.add_runtime_dependency 'find_a_port', '~> 1.0.1'
   gem.add_runtime_dependency 'rack-test', '~> 0.6.2'
@@ -33,4 +32,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'webmock', '~> 1.9.3'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'fakefs', '~> 0.4'
+  gem.add_development_dependency 'hashie', '~> 2.0'
 end

data/spec/features/consumption_spec.rb

@@ -96,80 +96,8 @@ describe "A service consumer side of a pact", :pact => true  do
 
     expect(bob_post_response.code).to eql '200'
     expect(bob_post_response.body).to eql([{"name" => "Roger", "age" => 20}].to_json)
-    expect{ bob_service.verify('goes a little something like this') }.to raise_error /do not match/
-  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
-
-    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: 'That is some good Mallory.')
-        })
-
-        interactions = Pact::ConsumerContract.from_json(File.read(zebra_service.consumer_contract.pactfile_path)).interactions
-        interactions.first.provider_state.should eq("the_zebras_are_here")
-        sleep 1
-    end
-  end
-
-  context "with a async interaction with provider" do
-    before do
-      Pact.clear_configuration
-
-      Pact.service_consumer "Consumer" do | config |
-        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
 
+    expect{ bob_service.verify('goes a little something like this') }.to raise_error /do not match/
   end
 
 end

data/spec/features/production_spec.rb

@@ -40,6 +40,7 @@ module Pact::Provider
     pact = Pact::ConsumerContract.from_json <<-EOS
     {
         "consumer" : { "name" : "a consumer"},
+        "provider" : { "name" : "a provider"},
         "interactions" : [
             {
                 "description": "donut creation request",
@@ -89,6 +90,7 @@ module Pact::Provider
         consumer_contract = Pact::ConsumerContract.from_json <<-EOS
         {
             "consumer" : { "name" : "the-wild-beast-store"},
+            "provider" : { "name" : "provider"},
             "interactions" : [
                 {
                     "description": "donut creation request",
@@ -120,6 +122,7 @@ module Pact::Provider
         consumer_contract = Pact::ConsumerContract.from_json <<-EOS
         {
             "consumer" : { "name" : "some consumer"},
+            "provider" : { "name" : "provider"},
             "interactions" : [
                 {
                     "description": "donut creation request",

data/spec/integration/consumer_spec.rb

@@ -0,0 +1,170 @@
+require 'net/http'
+require 'pact/consumer'
+require 'pact/consumer/rspec'
+
+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.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
+
+    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: 'That is some good Mallory.')
+        })
+
+        interactions = Pact::ConsumerContract.from_json(File.read(zebra_service.consumer_contract.pactfile_path)).interactions
+        interactions.first.provider_state.should eq("the_zebras_are_here")
+        sleep 1
+    end
+  end
+
+  context "with a async interaction with provider" do
+    before do
+      Pact.clear_configuration
+
+      Pact.service_consumer "Consumer" do | config |
+        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/pact/consumer_configuration_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'pact/configuration'
-require 'pact/consumer/dsl'
+require 'pact/consumer/configuration'
 
 describe "consumer side" do
   describe "configure" do

data/spec/lib/pact/consumer/{dsl_spec.rb → configuration_spec.rb}

@@ -1,16 +1,17 @@
 require 'spec_helper'
-require 'pact/consumer/dsl'
+require 'pact/consumer/configuration'
 
-module Pact::Consumer::DSL
+module Pact::Consumer::Configuration
 
-   describe Service do
+   describe MockService do
       before do
          Pact.clear_configuration
          Pact::Consumer::AppManager.instance.stub(:register_mock_service_for)
       end
       describe "configure_consumer_contract_builder" do
+         let(:consumer_name) {'consumer'}
          subject { 
-            Service.new :mock_service do
+            MockService.build :mock_service, consumer_name, provider_name do
                port 1234
                standalone true
                verify true
@@ -18,12 +19,12 @@ module Pact::Consumer::DSL
          }
 
          let(:provider_name) { 'Mock Provider'}
-         let(:consumer_contract_builder) { double('Pact::Consumer::ConsumerContractBuilder').as_null_object}
+         let(:consumer_contract_builder) { instance_double('Pact::Consumer::ConsumerContractBuilder')}
          let(:url) { "http://localhost:1234"}
 
          it "adds a verification to the Pact configuration" do
             Pact::Consumer::ConsumerContractBuilder.stub(:new).and_return(consumer_contract_builder)
-            subject.configure_consumer_contract_builder({})
+            subject.finalize
             consumer_contract_builder.should_receive(:verify)
             Pact.configuration.provider_verifications.first.call
          end
@@ -31,12 +32,12 @@ module Pact::Consumer::DSL
          context "when standalone" do
             it "does not register the app with the AppManager" do
                Pact::Consumer::AppManager.instance.should_not_receive(:register_mock_service_for)
-               subject.configure_consumer_contract_builder({})
+               subject.finalize
             end
          end
          context "when not standalone" do
             subject { 
-               Service.new :mock_service do
+               MockService.build :mock_service, consumer_name, provider_name do
                   port 1234
                   standalone false
                   verify true
@@ -44,7 +45,7 @@ module Pact::Consumer::DSL
             }            
             it "registers the app with the AppManager" do
                Pact::Consumer::AppManager.instance.should_receive(:register_mock_service_for).with(provider_name, url)
-               subject.configure_consumer_contract_builder({:provider_name => provider_name })
+               subject.finalize
             end
          end         
       end

data/spec/lib/pact/consumer/consumer_contract_builder_spec.rb

@@ -119,9 +119,9 @@ module Pact
 	          	}
 				}
 
-				let(:interaction_json) { interaction.to_json_for_mock_service }
+				let(:interaction_json) { {} }
 
-				let(:interaction) { Pact::Interaction.from_hash(JSON.parse(interaction_hash.to_json)) }
+				let(:interaction) { Pact::Interaction.from_hash(JSON.load(interaction_hash.to_json)) }
 
 				before do
 					stub_request(:post, 'localhost:2222/interactions')

data/spec/lib/pact/consumer/interaction_builder_spec.rb

@@ -49,7 +49,7 @@ module Pact
         let(:expected_request) { {an: 'expected_request'} }
 
         it "sets the request on the interaction as a instance of Request::Expected" do
-          Request::Expected.should_receive(:from_hash).with(request).and_return(expected_request)
+          Pact::Request::Expected.should_receive(:from_hash).with(request).and_return(expected_request)
           interaction.should_receive(:request=).with(expected_request)
           subject.with(request)
         end

data/spec/lib/pact/consumer/mock_service/interaction_list_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+require 'pact/consumer/mock_service/interaction_list'
+
+module Pact::Consumer
+
+  describe InteractionList do
+    shared_context "unexpected requests and missed interactions" do
+      let(:expected_interaction) { InteractionFactory.create }
+      let(:unexpected_request) { RequestFactory.create_actual }
+      subject {
+        interactionList = InteractionList.new
+        interactionList.add expected_interaction
+        interactionList.register_unexpected_request unexpected_request
+        interactionList
+       }
+    end
+
+    shared_context "no unexpected requests or missed interactions exist" do
+      let(:expected_interaction) { InteractionFactory.create }
+      let(:unexpected_request) { RequestFactory.create_actual }
+      subject {
+        interactionList = InteractionList.new
+        interactionList.add expected_interaction
+        interactionList.register_matched expected_interaction
+        interactionList
+       }
+    end
+
+    describe "interaction_diffs" do
+      context "when unexpected requests and missed interactions exist" do
+        include_context "unexpected requests and missed interactions"
+        let(:expected_diff) {
+          {:missing_interactions=>[expected_interaction.as_json], :unexpected_requests=>[unexpected_request.as_json]}
+        }
+        it "returns the unexpected requests and missed interactions" do
+          expect(subject.interaction_diffs).to eq expected_diff
+        end
+      end
+
+      context "when no unexpected requests or missed interactions exist" do
+        include_context "no unexpected requests or missed interactions exist"
+        let(:expected_diff) {
+          {}
+        }
+        it "returns an empty hash" do
+          expect(subject.interaction_diffs).to eq expected_diff
+        end
+      end
+    end
+
+    describe "all_matched?" do
+      context "when unexpected requests or missed interactions exist" do
+        include_context "unexpected requests and missed interactions"
+        it "returns false" do
+          expect(subject.all_matched?).to be_false
+        end
+      end
+      context "when unexpected requests or missed interactions do not exist" do
+        include_context "no unexpected requests or missed interactions exist"
+        it "returns false" do
+          expect(subject.all_matched?).to be_true
+        end
+      end
+    end
+  end
+end