pact 1.0.30 → 1.0.31

data/spec/features/consumption_spec.rb

@@ -4,6 +4,9 @@ require 'pact/consumer/rspec'
 
 describe "A service consumer side of a pact", :pact => true  do
 
+  describe "blah" do
+    describe "thing" do
+
   it "goes a little something like this" do
     Pact.clear_configuration
 
@@ -101,4 +104,6 @@ describe "A service consumer side of a pact", :pact => true  do
   end
 
 end
+end
+end
 

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

@@ -3,150 +3,165 @@ require 'fileutils'
 require 'pathname'
 
 module Pact
-	module Consumer
-		describe ConsumerContractBuilder do
-
-		   describe "initialize" do
-		   	SUPPORT_PACT_FILE = './spec/support/a_consumer-a_provider.json'
-			   before do
-			      Pact.clear_configuration
-			      Pact.configuration.stub(:pact_dir).and_return(File.expand_path(tmp_pact_dir))
-			      FileUtils.rm_rf tmp_pact_dir
-			      FileUtils.mkdir_p tmp_pact_dir
-			      FileUtils.cp SUPPORT_PACT_FILE, "#{tmp_pact_dir}/a_consumer-a_provider.json"
-			   end
-
-			   let(:expected_interactions) { ConsumerContract.from_json(File.read(SUPPORT_PACT_FILE)).interactions }
-
-			   let(:tmp_pact_dir) {"./tmp/pacts"}
-
-			   let(:consumer_name) { 'a consumer' }
-			   let(:provider_name) { 'a provider' }
-			   let(:consumer_contract_builder) {
-			      Pact::Consumer::ConsumerContractBuilder.new(
-			         :pactfile_write_mode => pactfile_write_mode,
-			         :consumer_name => consumer_name,
-			         :provider_name => provider_name,
-			         :port => 1234)}
-
-			   context "when overwriting pact" do
-			      let(:pactfile_write_mode) {:overwrite}
-			      it "it overwrites the existing pact file" do
-			         expect(consumer_contract_builder.consumer_contract.interactions).to eq []
-			      end
-
-			      it "uses an DistinctInteractionsFilter to handle new interactions" do
-			      	Pact::Consumer::DistinctInteractionsFilter.should_receive(:new).with([])
-			      	consumer_contract_builder
-			      end
-			   end
-
-			   context "when updating pact" do
-				   	before do
-
-				   	end
-			      let(:pactfile_write_mode) {:update}
-			      it "loads the interactions from the existing pact file" do
-			      	ConsumerContractBuilder.any_instance.stub(:info_and_puts)
-			        expect(consumer_contract_builder.consumer_contract.interactions).to eq expected_interactions
-			      end
-
-			      it "uses an UpdatableInteractionsFilter to handle new interactions" do
-			      	ConsumerContractBuilder.any_instance.stub(:info_and_puts)
-			      	Pact::Consumer::UpdatableInteractionsFilter.should_receive(:new).with(expected_interactions)
-			      	consumer_contract_builder
-			      end
-
-			      let(:line0) { /\*/ }
-			      let(:line1) { /Updating existing file/ }
-			      let(:line2) { /Only interactions defined in this test run will be updated/ }
-			      let(:line3) { /As interactions are identified by description and provider state/ }
-			      it "logs a description message" do
-			      	$stdout.should_receive(:puts).with(line0).twice
-			      	$stdout.should_receive(:puts).with(line1)
-			      	$stdout.should_receive(:puts).with(line2)
-			      	$stdout.should_receive(:puts).with(line3)
-			      	Pact.configuration.logger.should_receive(:info).with(line0).twice
-			      	Pact.configuration.logger.should_receive(:info).with(line1)
-			      	Pact.configuration.logger.should_receive(:info).with(line2)
-			      	Pact.configuration.logger.should_receive(:info).with(line3)
-			      	consumer_contract_builder
-			      end
-			   end
-
-			   context "when an error occurs deserializing the existing pactfile" do
-			   	let(:pactfile_write_mode) {:update}
-			   	let(:error) { RuntimeError.new('some error')}
-			   	let(:line1) { /Could not load existing consumer contract from .* due to some error/ }
-			   	let(:line2) {'Creating a new file.'}
-			   	before do
-			   		ConsumerContract.stub(:from_json).and_raise(error)
-			   		$stderr.should_receive(:puts).with(line1)
-			   		$stderr.should_receive(:puts).with(line2)
-			   		Pact.configuration.logger.should_receive(:warn).with(line1)
-			   		Pact.configuration.logger.should_receive(:warn).with(line2)
-			   	end
-			   	it "logs the error" do
-			   		consumer_contract_builder
-			   	end
-
-			   	it "continues with a new file" do
-			   		expect(consumer_contract_builder.consumer_contract.interactions).to eq []
-			   	end
-			   end
-		   end
-
-			describe "handle_interaction_fully_defined" do
-
-				subject {
-					Pact::Consumer::ConsumerContractBuilder.new({:consumer_name => 'blah', :provider_name => 'blah', :port => 2222})
-				}
-
-				let(:interaction_hash) {
-					{
-		            description: 'Test request',
-		            request: {
-		              method: 'post',
-		              path: '/foo',
-		              body: Term.new(generate: 'waffle', matcher: /ffl/),
-		              headers: { 'Content-Type' => 'application/json' },
-		              query: "",
-		            },
-		            response: {
-		              baz: 'qux',
-		              wiffle: 'wiffle'
-		            }
-	          	}
-				}
-
-				let(:interaction_json) { {} }
-
-				let(:interaction) { Pact::Interaction.from_hash(JSON.load(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 "adds the interaction to the consumer contract" do
-	      		subject.handle_interaction_fully_defined interaction
-	      		expect(subject.consumer_contract.interactions).to eq [interaction]
-	      	end
-
-	      	it "updates the provider's pactfile" do
-	      		subject.consumer_contract.should_receive(:update_pactfile)
-	      		subject.handle_interaction_fully_defined interaction
-	      	end
-
-	      	it "resets the interaction_builder to nil" do
-	      		subject.should_receive(:interaction_builder=).with(nil)
-	      		subject.handle_interaction_fully_defined interaction
-	      	end
-			end
-		end
-	end
-end
+  module Consumer
+    describe ConsumerContractBuilder do
+
+      let(:consumer_name) { 'a consumer' }
+      let(:provider_name) { 'a provider' }
+
+      describe "initialize" do
+        SUPPORT_PACT_FILE = './spec/support/a_consumer-a_provider.json'
+        before do
+          Pact.clear_configuration
+          Pact.configuration.stub(:pact_dir).and_return(File.expand_path(tmp_pact_dir))
+          FileUtils.rm_rf tmp_pact_dir
+          FileUtils.mkdir_p tmp_pact_dir
+          FileUtils.cp SUPPORT_PACT_FILE, "#{tmp_pact_dir}/a_consumer-a_provider.json"
+        end
+
+        let(:expected_interactions) { ConsumerContract.from_json(File.read(SUPPORT_PACT_FILE)).interactions }
+
+        let(:tmp_pact_dir) {"./tmp/pacts"}
+
+        let(:consumer_contract_builder) {
+          Pact::Consumer::ConsumerContractBuilder.new(
+            :pactfile_write_mode => pactfile_write_mode,
+            :consumer_name => consumer_name,
+            :provider_name => provider_name,
+        :port => 1234)}
+
+        context "when overwriting pact" do
+          let(:pactfile_write_mode) {:overwrite}
+          it "it overwrites the existing pact file" do
+            expect(consumer_contract_builder.consumer_contract.interactions).to eq []
+          end
+
+          it "uses an DistinctInteractionsFilter to handle new interactions" do
+            Pact::Consumer::DistinctInteractionsFilter.should_receive(:new).with([])
+            consumer_contract_builder
+          end
+        end
+
+        context "when updating pact" do
+          before do
+
+          end
+          let(:pactfile_write_mode) {:update}
+          it "loads the interactions from the existing pact file" do
+            ConsumerContractBuilder.any_instance.stub(:info_and_puts)
+            expect(consumer_contract_builder.consumer_contract.interactions).to eq expected_interactions
+          end
+
+          it "uses an UpdatableInteractionsFilter to handle new interactions" do
+            ConsumerContractBuilder.any_instance.stub(:info_and_puts)
+            Pact::Consumer::UpdatableInteractionsFilter.should_receive(:new).with(expected_interactions)
+            consumer_contract_builder
+          end
+
+          let(:line0) { /\*/ }
+          let(:line1) { /Updating existing file/ }
+          let(:line2) { /Only interactions defined in this test run will be updated/ }
+          let(:line3) { /As interactions are identified by description and provider state/ }
+          it "logs a description message" do
+            $stdout.should_receive(:puts).with(line0).twice
+            $stdout.should_receive(:puts).with(line1)
+            $stdout.should_receive(:puts).with(line2)
+            $stdout.should_receive(:puts).with(line3)
+            Pact.configuration.logger.should_receive(:info).with(line0).twice
+            Pact.configuration.logger.should_receive(:info).with(line1)
+            Pact.configuration.logger.should_receive(:info).with(line2)
+            Pact.configuration.logger.should_receive(:info).with(line3)
+            consumer_contract_builder
+          end
+        end
+
+        context "when an error occurs deserializing the existing pactfile" do
+          let(:pactfile_write_mode) {:update}
+          let(:error) { RuntimeError.new('some error')}
+          let(:line1) { /Could not load existing consumer contract from .* due to some error/ }
+          let(:line2) {'Creating a new file.'}
+          before do
+            ConsumerContract.stub(:from_json).and_raise(error)
+            $stderr.should_receive(:puts).with(line1)
+            $stderr.should_receive(:puts).with(line2)
+            Pact.configuration.logger.should_receive(:warn).with(line1)
+            Pact.configuration.logger.should_receive(:warn).with(line2)
+          end
+          it "logs the error" do
+            consumer_contract_builder
+          end
+
+          it "continues with a new file" do
+            expect(consumer_contract_builder.consumer_contract.interactions).to eq []
+          end
+        end
+      end
+
+      describe "handle_interaction_fully_defined" do
+
+        subject {
+          Pact::Consumer::ConsumerContractBuilder.new({:consumer_name => 'blah', :provider_name => 'blah', :port => 2222})
+        }
+
+        let(:interaction_hash) {
+          {
+            description: 'Test request',
+            request: {
+              method: 'post',
+              path: '/foo',
+              body: Term.new(generate: 'waffle', matcher: /ffl/),
+              headers: { 'Content-Type' => 'application/json' },
+              query: "",
+            },
+            response: {
+              baz: 'qux',
+              wiffle: 'wiffle'
+            }
+          }
+        }
+
+        let(:interaction_json) { {} }
+
+        let(:interaction) { Pact::Interaction.from_hash(JSON.load(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 "adds the interaction to the consumer contract" do
+          subject.handle_interaction_fully_defined interaction
+          expect(subject.consumer_contract.interactions).to eq [interaction]
+        end
+
+        it "updates the provider's pactfile" do
+          subject.consumer_contract.should_receive(:update_pactfile)
+          subject.handle_interaction_fully_defined interaction
+        end
+
+        it "resets the interaction_builder to nil" do
+          subject.should_receive(:interaction_builder=).with(nil)
+          subject.handle_interaction_fully_defined interaction
+        end
+      end
+
+      describe "#mock_service_base_url" do
+
+      	subject {
+      		ConsumerContractBuilder.new(
+      			:pactfile_write_mode => :overwrite,
+            :consumer_name => consumer_name,
+            :provider_name => provider_name,
+        		:port => 1234) }
+
+      	it "returns the mock service base URL" do
+      		expect(subject.mock_service_base_url).to eq("http://localhost:1234")
+      	end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+require 'spec_helper'
+require 'rack/test'
+require 'tempfile'
+
+module Pact
+  module Consumer
+
+    describe MockService do
+
+      include Rack::Test::Methods
+
+      def app
+        MockService.new(log_file: temp_file)
+      end
+
+      let(:temp_file) { Tempfile.new('log') }
+
+      after do
+        temp_file.close
+        temp_file.unlink
+      end
+
+      context "when a StandardError is encountered" do
+        let(:response) { JSON.parse(last_response.body)}
+        let(:interaction_replay) { double(InteractionReplay, :match? => true)}
+
+        before do
+          InteractionReplay.stub(:new).and_return(interaction_replay)
+          interaction_replay.stub(:respond).and_raise("an error")
+        end
+
+        subject { get "/" }
+
+        it "returns a json error" do
+          subject
+          expect(last_response.content_type).to eq 'application/json'
+        end
+
+        it "includes the error message" do
+          subject
+          expect(response['message']).to eq "an error"
+        end
+
+        it "includes the backtrace" do
+          subject
+          expect(response['backtrace']).to be_instance_of Array
+        end
+      end
+
+    end
+  end
+end

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

@@ -27,20 +27,20 @@ module Pact
           let(:diff_1) { {body: nil} }
 
           it "returns a message indicating that the body does not match" do
-            expect(subject.short_summary).to include "(body did not match)"
+            expect(subject.short_summary).to include "(request body did not match)"
           end
         end
         context "when the headers do not match" do
           let(:diff_1) { {headers: nil} }
           it "returns a message indicating that the body does not match" do
-            expect(subject.short_summary).to include "(headers did not match)"
+            expect(subject.short_summary).to include "(request headers did not match)"
           end
         end
         context "when the headers and body do not match" do
           let(:diff_1) { {body: nil, headers: nil} }
           let(:diff_2) { {body: nil, headers: nil} }
           it "returns a message indicating that the headers and body do not match" do
-            expect(subject.short_summary).to include "(body and headers did not match)"
+            expect(subject.short_summary).to include "(request body and headers did not match)"
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.0.30
+  version: 1.0.31
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -31,22 +31,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.7
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -297,9 +281,19 @@ files:
 - Rakefile
 - bin/pact
 - config.ru
+- documentation/Testing with pact.png
+- documentation/faq.md
+- documentation/raq.md
+- documentation/terminology.md
 - example/animal-service/Gemfile
 - example/animal-service/Gemfile.lock
 - example/animal-service/Rakefile
+- example/animal-service/config.ru
+- example/animal-service/db/animal_db.sqlite3
+- example/animal-service/db/animals_db.sqlite3
+- example/animal-service/lib/animal_service/animal_repository.rb
+- example/animal-service/lib/animal_service/api.rb
+- example/animal-service/lib/animal_service/db.rb
 - example/animal-service/spec/service_consumers/pact_helper.rb
 - example/animal-service/spec/service_consumers/provider_states_for_zoo_app.rb
 - example/zoo-app/Gemfile
@@ -307,7 +301,7 @@ files:
 - example/zoo-app/lib/zoo_app/animal_service_client.rb
 - example/zoo-app/lib/zoo_app/models/alligator.rb
 - example/zoo-app/spec/pacts/zoo_app-animal_service.json
-- example/zoo-app/spec/service_providers/animal_service_spec.rb
+- example/zoo-app/spec/service_providers/animal_service_client_spec.rb
 - example/zoo-app/spec/service_providers/pact_helper.rb
 - example/zoo-app/spec/spec_helper.rb
 - lib/pact.rb
@@ -336,11 +330,15 @@ files:
 - lib/pact/consumer/mock_service_interaction_expectation.rb
 - lib/pact/consumer/request.rb
 - lib/pact/consumer/rspec.rb
+- lib/pact/consumer/rspec/full_example_description.rb
 - lib/pact/consumer/server.rb
+- lib/pact/consumer/spec_hooks.rb
 - lib/pact/consumer_contract.rb
 - lib/pact/consumer_contract/active_support_support.rb
 - lib/pact/consumer_contract/consumer_contract.rb
+- lib/pact/consumer_contract/file_name.rb
 - lib/pact/consumer_contract/interaction.rb
+- lib/pact/consumer_contract/pact_file.rb
 - lib/pact/consumer_contract/request.rb
 - lib/pact/consumer_contract/service_consumer.rb
 - lib/pact/consumer_contract/service_provider.rb
@@ -394,6 +392,7 @@ files:
 - spec/lib/pact/consumer/consumer_contract_builder_spec.rb
 - spec/lib/pact/consumer/interaction_builder_spec.rb
 - spec/lib/pact/consumer/interactions_spec.rb
+- spec/lib/pact/consumer/mock_service/app_spec.rb
 - spec/lib/pact/consumer/mock_service/interaction_list_spec.rb
 - spec/lib/pact/consumer/mock_service/interaction_mismatch_spec.rb
 - spec/lib/pact/consumer/mock_service/interaction_replay_spec.rb
@@ -450,18 +449,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2811888500832128334
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2811888500832128334
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -483,6 +476,7 @@ test_files:
 - spec/lib/pact/consumer/consumer_contract_builder_spec.rb
 - spec/lib/pact/consumer/interaction_builder_spec.rb
 - spec/lib/pact/consumer/interactions_spec.rb
+- spec/lib/pact/consumer/mock_service/app_spec.rb
 - spec/lib/pact/consumer/mock_service/interaction_list_spec.rb
 - spec/lib/pact/consumer/mock_service/interaction_mismatch_spec.rb
 - spec/lib/pact/consumer/mock_service/interaction_replay_spec.rb