pact 0.1.28 → 0.1.35

data/spec/features/consumption_spec.rb

@@ -2,29 +2,24 @@ require 'net/http'
 require 'pact/consumer'
 require 'pact/consumer/rspec'
 
-
 describe "A service consumer side of a pact", :pact => true  do
 
   it "goes a little something like this" do
     Pact.clear_configuration
 
-    Pact.configure do | config |
-      config.consumer do
-        name "Consumer"
-      end
-    end
-
-    Pact.with_producer "Alice Service" do
-      mock_service :alice_service do
-        verify true
-        port 1234
+    Pact.service_consumer "Consumer" do
+      has_pact_with "Alice Service" do
+        mock_service :alice_service do
+          verify true
+          port 1234
+        end
       end
-    end
 
-    Pact.with_producer "Bob" do
-      mock_service :bob_service do
-        verify false
-        port 4321
+      has_pact_with "Bob" do
+        mock_service :bob_service do
+          verify false
+          port 4321
+        end
       end
     end
 
@@ -109,12 +104,12 @@ describe "A service consumer side of a pact", :pact => true  do
       Pact.clear_configuration
 
       Pact.configure do | config |
-        config.consumer do
+        config.service_consumer do
           name "Consumer"
         end
       end
 
-      Pact.with_producer "Zebra Service" do
+      Pact.with_service_provider "Zebra Service" do
         mock_service :zebra_service do
           verify false
           port 1235
@@ -142,5 +137,48 @@ describe "A service consumer side of a pact", :pact => true  do
     end
   end
 
+  context "with a async interaction with producer" do
+    before do
+      Pact.clear_configuration
+
+      Pact.configure do | config |
+        config.service_consumer do
+          name "Consumer"
+        end
+      end
+
+      Pact.with_service_provider "Zebra Service" do
+        mock_service :zebra_service do
+          verify true
+          port 1239
+        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/features/production_spec.rb

@@ -1,4 +1,4 @@
-require 'pact/producer/rspec'
+require 'pact/provider/rspec'
 require 'pact/consumer_contract'
 require 'features/producer_states/zebras'
 
@@ -74,11 +74,8 @@ module Pact::Producer
     EOS
 
     before do
-        Pact.configure do |config|
-            config.producer do
-                name "My Producer"
-                app { ServiceUnderTest.new }
-            end
+        Pact.service_provider "My Provider" do
+            app { ServiceUnderTest.new }
         end
     end
 
@@ -110,11 +107,8 @@ module Pact::Producer
         EOS
 
         before do
-            Pact.configure do |config|
-                config.producer do
-                    name "My Producer"
-                    app { ServiceUnderTestWithFixture.new }
-                end
+            Pact.service_provider "My Provider" do
+                app { ServiceUnderTestWithFixture.new }
             end
         end
 
@@ -144,11 +138,8 @@ module Pact::Producer
         EOS
 
         before do
-            Pact.configure do |config|
-                config.producer do
-                    name "ServiceUnderTestWithFixture"
-                    app { ServiceUnderTestWithFixture.new }
-                end
+            Pact.service_provider "ServiceUnderTestWithFixture" do
+                app { ServiceUnderTestWithFixture.new }
             end
         end
 

data/spec/integration/pact/consumer_configuration_spec.rb

@@ -0,0 +1,144 @@
+require 'spec_helper'
+require 'pact/configuration'
+require 'pact/consumer/dsl'
+require 'pact/consumer/configuration_dsl'
+require 'pact/producer/configuration_dsl'
+
+describe "consumer side" do
+  describe "configure" do
+
+    class TestHelper
+      include Pact::Consumer::ConsumerContractBuilders
+    end
+
+    let(:application) { double("App")}
+
+    before do
+      Pact.clear_configuration
+      Pact::Consumer::AppManager.instance.clear_all
+      #Don't want processes actually spawning
+      Pact::Consumer::AppRegistration.any_instance.stub(:spawn)
+
+      my_app = application
+
+      Pact.service_consumer "My Consumer" do
+        app my_app
+        port 1111
+
+        has_pact_with "My Service" do
+          mock_service :my_service do
+            port 1234
+            standalone true
+          end
+        end
+
+        has_pact_with "My Other Service" do
+          mock_service :my_other_service do
+            port 1235
+            standalone false
+          end
+        end
+      end
+
+    end
+
+    describe "consumer" do
+
+      subject { TestHelper.new.my_service.consumer_contract.consumer }
+
+      it "should be configured" do
+        expect(subject).to be_instance_of Pact::Consumer::ServiceConsumer
+      end
+
+      it "should have the right name" do
+        expect(subject.name).to eq "My Consumer"
+      end
+
+      it "should have registered the app" do
+        Pact::Consumer::AppManager.instance.app_registered_on?(1111).should be_true
+      end
+    end
+
+    describe "producers" do
+
+      subject { TestHelper.new.my_service }
+
+      it "should have defined methods in MockServices for the producers" do
+        subject.should be_instance_of Pact::Consumer::ConsumerContractBuilder
+      end
+
+      context "when standalone is true" do
+        it "is not registerd with the AppManager" do
+          Pact::Consumer::AppManager.instance.app_registered_on?(1234).should be_false
+        end
+      end
+
+      context "when standalone is false" do
+        it "should register the MockServices on their given ports if they are not" do
+          Pact::Consumer::AppManager.instance.app_registered_on?(1235).should be_true
+        end
+      end
+    end
+  end
+
+
+  describe "deprecated configure" do
+
+    before do
+      Pact.clear_configuration
+      Pact::Consumer::AppManager.instance.clear_all
+
+      Pact.configure do | config |
+        config.service_consumer do
+          name "My Consumer"
+        end
+      end
+
+      Pact.with_service_provider "My Service" do
+        mock_service :my_service do
+          port 1234
+          standalone true
+        end
+      end
+
+      Pact.with_service_provider "My Other Service" do
+        mock_service :my_other_service do
+          port 1235
+          standalone false
+        end
+      end
+    end
+
+    describe "configuration" do
+      it "should return the same configuration object each time" do
+        expect(Pact.configuration).to equal(Pact.configuration)
+      end
+    end
+
+    describe "deprecated consumer" do
+      it "should be configured" do
+        Pact.configuration.consumer.name.should eq "My Consumer"
+      end
+    end
+
+    describe "producers" do
+      include Pact::Consumer::ConsumerContractBuilders
+
+      it "should have defined methods in MockServices for the producers" do
+        my_service.should be_instance_of Pact::Consumer::ConsumerContractBuilder
+      end
+
+      context "when standalone is true" do
+        it "is not registerd with the AppManager" do
+          Pact::Consumer::AppManager.instance.app_registered_on?(1234).should be_false
+        end
+      end
+
+      context "when standalone is false" do
+        it "should register the MockServices on their given ports if they are not" do
+          Pact::Consumer::AppManager.instance.app_registered_on?(1235).should be_true
+        end
+      end
+    end
+  end
+end

data/spec/integration/pact/provider_configuration_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'pact/provider/rspec'
+
+describe "provider side" do
+   describe "configure" do
+
+      class TestHelper
+         include Pact::Producer::RSpec::InstanceMethods
+      end
+
+      let(:application) { double("App")}
+      before do
+         app_block = ->{ application }
+         Pact.service_provider "My Provider" do
+            app &app_block
+         end         
+      end
+
+      it "makes the app available to the tests" do
+         expect(TestHelper.new.app).to be(application)
+      end
+
+   end
+end

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

@@ -38,12 +38,12 @@ module Pact
 			      it "updates the existing pact file" do
 			         expect(consumer_contract_builder.consumer_contract.interactions.size).to eq 2
 			      end
-			   end		   	
-		   end			
+			   end
+		   end
 
 			describe "handle_interaction_fully_defined" do
 
-				subject { 
+				subject {
 					Pact::Consumer::ConsumerContractBuilder.new({:consumer_name => 'blah', :producer_name => 'blah', :port => 2222})
 				}
 
@@ -64,23 +64,23 @@ module Pact
 	          	}
 				}
 
-				let(:interaction_json) { JSON.dump(interaction_hash) }
+				let(:interaction_json) { interaction.to_json_for_mock_service }
 
-				let(:interaction) { Pact::Consumer::Interaction.from_hash(JSON.parse(interaction_json)) }
+				let(:interaction) { Pact::Consumer::Interaction.from_hash(JSON.parse(interaction_hash.to_json)) }
 
 				before do
 					stub_request(:post, 'localhost:2222/interactions')
 				end
 
-	        	it "posts the interaction with generated response to the mock service" do
-	          	subject.handle_interaction_fully_defined interaction
-	          	WebMock.should have_requested(:post, 'localhost:2222/interactions').with(body: interaction_json)
-	        	end
+      	it "posts the interaction with generated response to the mock service" do
+        	subject.handle_interaction_fully_defined interaction
+        	WebMock.should have_requested(:post, 'localhost:2222/interactions').with(body: interaction_json)
+      	end
 
-	        	it "updates the Producer's Pactfile" do
-	        		subject.consumer_contract.should_receive(:update_pactfile)
-	        		subject.handle_interaction_fully_defined interaction
-	        	end
+      	it "updates the Producer's Pactfile" do
+      		subject.consumer_contract.should_receive(:update_pactfile)
+      		subject.handle_interaction_fully_defined interaction
+      	end
 			end
 		end
 	end

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

@@ -3,6 +3,7 @@ require 'pact/consumer/dsl'
 require 'pact/consumer/configuration_dsl'
 
 module Pact::Consumer::DSL
+
    describe Service do
       before do
          Pact.clear_configuration

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

@@ -41,6 +41,40 @@ module Pact
 
       end
 
+      describe "as_json_for_mock_service" do
+        let(:as_json_with_options ) { {:opts => 'blah'} }
+        let(:request) { double(Pact::Request::Expected, :as_json_with_options => {:opts => 'blah'})}
+        let(:response) { double('response') }
+        let(:generated_response ) { double('generated_response', :to_json => 'generated_response') }
+        subject { Interaction.new(:description => 'description', :request => request, :response => response, :producer_state => 'ignored')}
+        let(:expected_hash) { {:response => generated_response, :request => as_json_with_options, :description => '' } }
+
+        before do
+          Reification.stub(:from_term).with(response).and_return(generated_response)
+        end
+
+        it "generates an actual response" do
+          Reification.should_receive(:from_term).with(response).and_return(generated_response)
+          expect(subject.as_json_for_mock_service[:response]).to eq generated_response
+        end
+
+        it "includes the options in the request" do
+          expect(subject.as_json_for_mock_service[:request]).to eq as_json_with_options
+        end
+
+        it "does not send the producer state" do
+          expect(subject.as_json_for_mock_service.key?(:producer_state)).to be_false
+        end
+
+        it "includes the description" do
+          expect(subject.as_json_for_mock_service[:description]).to eq 'description'
+        end
+
+        it "doesn't have any other keys" do
+          expect(subject.as_json_for_mock_service.keys).to eq [:response, :request, :description]
+        end
+      end
+
       describe "to JSON" do
 
         let(:parsed_result) do

data/spec/lib/pact/consumer_contract_spec.rb

@@ -11,9 +11,18 @@ module Pact
         end
       end
 
+      def silence_warnings
+        old_verbose, $VERBOSE = $VERBOSE, nil
+        yield
+      ensure
+        $VERBOSE = old_verbose
+      end      
+
       before do
         @backup_version = Pact::VERSION
-        Pact::VERSION = "1.0"
+        silence_warnings do
+          Pact::VERSION = "1.0"
+        end
         DateTime.stub(:now).and_return(DateTime.strptime("2013-08-15T13:27:13+10:00"))
       end
 
@@ -27,7 +36,9 @@ module Pact
       end
 
       after do
-        Pact::VERSION = @backup_version
+        silence_warnings do
+          Pact::VERSION = @backup_version
+        end
       end
     end
 

data/spec/lib/pact/matchers/matchers_spec.rb

@@ -5,6 +5,26 @@ require 'pact/matchers'
 describe Pact::Matchers do
   include Pact::Matchers
 
+  describe 'option {allow_unexpected_keys: false}' do
+    context "when an unexpected key is found" do
+      let(:expected) { {:a => 1} }
+      let(:actual) { {:a => 1, :b => 2} }
+      let(:difference) { {:b => {:expected => '<key not to be present>', :actual => 2 }} }
+      it "returns it in the diff" do
+        expect(diff(expected, actual, allow_unexpected_keys: false)).to eq difference
+      end
+    end
+  end
+
+  describe "expecting key to be present with nil value and not finding key" do
+    let(:expected) { {a: nil} }
+    let(:actual) { {} }
+    let(:difference) { {a: {expected: nil, actual: Pact::Matchers::KeyNotFound.new }} }
+    it "returns the key in the diff" do
+      expect(diff(expected, actual)).to eq difference
+    end
+  end
+
   describe 'structure_diff' do
     let(:expected) {
       {a: 'a string', b: 1, c: nil, d: [{e: 'thing'}], f: {g: 10}}
@@ -40,14 +60,14 @@ describe Pact::Matchers do
         let(:difference) { {:a=>{:expected=>{:class=>Fixnum, :eg=>1}, :actual=>{:class=>Hash, :value=>{:b=>1}}}} }
         it "returns the diff" do
           expect(structure_diff(expected, actual)).to eq difference
-        end        
+        end
       end
       context "and an array is found" do
         let(:actual) { {a: [1] } }
         let(:difference) { {:a=>{:expected=>{:class=>Fixnum, :eg=>1}, :actual=>{:class=>Array, :value=>[1]}}} }
         it "returns the diff" do
           expect(structure_diff(expected, actual)).to eq difference
-        end         
+        end
       end
     end
 
@@ -61,7 +81,7 @@ describe Pact::Matchers do
                 :expected=> { :class=>String, :eg=>"Mary" },
                 :actual=> { :class=>Fixnum, :value=>1} }
             }
-          ] 
+          ]
         }
         it "returns the diff" do
           expect(structure_diff(expected, actual)).to eq difference
@@ -77,7 +97,7 @@ describe Pact::Matchers do
         let(:difference) { {:a=>{:expected=>nil, :actual=>{:class=>String, :value=>"a string"}}} }
         it "returns the diff" do
           expect(structure_diff(expected, actual)).to eq difference
-        end          
+        end
       end
     end
 
@@ -88,8 +108,8 @@ describe Pact::Matchers do
         let(:difference) { {:a=>{:expected=>/p/, :actual=>"banana"}} }
         it "returns the diff" do
           expect(structure_diff(expected, actual)).to eq difference
-        end          
-      end      
+        end
+      end
     end
   end
 
@@ -122,7 +142,7 @@ describe Pact::Matchers do
       end
       context "when the actual value is an hash" do
         let(:actual) { {b: 'c'} }
-        let(:difference) { { a: {expected:"b", actual: nil}} }
+        let(:difference) { { a: {expected:"b", actual: Pact::Matchers::KeyNotFound.new}} }
         it "should return the diff" do
           expect(diff(subject, actual)).to eql(difference)
         end
@@ -261,17 +281,17 @@ describe Pact::Matchers do
     end
 
     context "when the expected value is a String matcher" do
-      
+
     end
 
     context "when the expected value is a Number matcher" do
-      
+
     end
     context "when the expected value is an array with a matcher" do
-      
+
     end
     context "when the expected value is a hash with a matcher" do
-      
+
     end
 
     context "when an expected value is nil but not nil is found" do
@@ -286,7 +306,7 @@ describe Pact::Matchers do
     context "a deep mismatch" do
       subject { {a:  {b: { c: [1,2]}, d: { e: Pact::Term.new(matcher: /a/)}}, f: 1, g: {h: 99}} }
       let(:actual) { {a:  {b: { c: [1,2]}, d: { e: 'food'}}, f: "thing"} }
-      let(:difference) { {:a=>{:d=>{:e=>{:expected=>/a/, :actual=>"food"}}}, :f=>{:expected=>1, :actual=>"thing"}, :g=>{:expected=>{:h=>99}, :actual=>nil}} }
+      let(:difference) { {:a=>{:d=>{:e=>{:expected=>/a/, :actual=>"food"}}}, :f=>{:expected=>1, :actual=>"thing"}, :g=>{:expected=>{:h=>99}, :actual=> Pact::Matchers::KeyNotFound.new}} }
 
       it 'should return the diff' do
         expect(diff(subject, actual)).to eql(difference)

data/spec/lib/pact/producer/rspec_spec.rb

@@ -1,4 +1,4 @@
-require 'pact/producer/rspec'
+require 'pact/provider/rspec'
 
 describe "the match_term matcher" do
 

data/spec/lib/pact/request_spec.rb

@@ -45,9 +45,34 @@ module Pact
   describe Request::Expected do
     it_behaves_like "a request"
 
+    describe "as_json_with_options" do
+      subject { Request::Expected.new(:get, '/path', {:header => 'value'}, {:body => 'yeah'}, "query", options) }
+      context "with options" do
+        let(:options) { {some: 'options'} }
+        it "includes the options" do
+          expect(subject.as_json_with_options[:options]).to eq options
+        end
+      end
+      context "without options" do
+        let(:options) { {} }
+        it "does not include the options" do
+          expect(subject.as_json_with_options.key?(:options)).to be_false
+        end
+      end
+    end
+    describe "as_json" do
+      subject { Request::Expected.new(:get, '/path', {:header => 'value'}, {:body => 'yeah'}, "query", {some: 'options'}) }
+      context "with options" do
+        it "does not include the options" do
+          expect(subject.as_json.key?(:options)).to be_false
+        end
+      end
+    end
+
     describe "matching to actual requests" do
 
-      subject { Request::Expected.new(expected_method, expected_path, expected_headers, expected_body, expected_query) }
+      subject { Request::Expected.new(expected_method, expected_path, expected_headers, expected_body, expected_query, options) }
+      let(:options) { {} }
 
       let(:expected_method) { 'get' }
       let(:expected_path) { '/foo' }
@@ -307,6 +332,23 @@ module Pact
           expect(subject.match actual_request).to be_false
         end
       end
+
+      context "when unexpected keys are found in the body" do
+        let(:expected_body) { {a: 1} }
+        let(:actual_body) { {a: 1, b: 2} }
+        context "when allowing unexpected keys" do
+          let(:options) { {'allow_unexpected_keys_in_body' => true} } #From json, these will be strings
+          it "matches" do
+            expect(subject.match actual_request).to be_true
+          end
+        end
+        context "when not allowing unexpected keys" do
+          let(:options) { {'allow_unexpected_keys_in_body' => false} }
+          it "does not match" do
+            expect(subject.match actual_request).to be_false
+          end
+        end
+      end
     end
   end
 

data/spec/support/pact_rake_support.rb

@@ -12,17 +12,14 @@ module Pact
 			end
 		end
 
-		Pact.configure do | config |
-			config.producer do
-				name "Some Producer"
-				app { TestApp.new }
-			end
+		Pact.service_provider "Some Producer" do
+			app { TestApp.new }
 		end
 
 
 		#one with a top level consumer
-		Pact.with_consumer 'some-test-consumer' do
-			producer_state "the weather is sunny" do
+		Pact.provider_states_for 'some-test-consumer' do
+			provider_state "the weather is sunny" do
 				set_up do
 					WEATHER ||= {}
 					WEATHER[:current_state] = 'sunny'
@@ -31,7 +28,7 @@ module Pact
 		end
 
 		#one without a top level consumer
-		Pact.producer_state "the weather is cloudy" do
+		Pact.provider_state "the weather is cloudy" do
 			set_up do
 				WEATHER ||= {}
 				WEATHER[:current_state] = 'cloudy'