pact 1.4.0.rc3 → 1.4.0.rc4

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.rc4 (22 October 2014)
+
+* e56775a - Upgraded pact support gems to allow form bodies to be specified as Hashes with Pact::Terms (bethesque, Wed Oct 22 15:31:30 2014 +1100)
+
 ### 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)

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    pact (1.4.0.rc3)
+    pact (1.4.0.rc4)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json
-      pact-mock_service (~> 0.0.1)
-      pact-support (~> 0.0.3)
+      pact-mock_service (~> 0.1.0)
+      pact-support (~> 0.1.2)
       rack-test (~> 0.6.2)
       randexp (~> 0.1.7)
       rspec (>= 2.14)
@@ -39,17 +39,18 @@ GEM
     method_source (0.8.2)
     minitest (5.3.4)
     multipart-post (2.0.0)
-    pact-mock_service (0.0.1)
+    pact-mock_service (0.1.0)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json
+      pact-support (~> 0.1.1)
       rack
       rack-test (~> 0.6.2)
       rspec (>= 2.14)
       term-ansicolor (~> 1.0)
       thor
       webrick
-    pact-support (0.0.3)
+    pact-support (0.1.2)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json
@@ -71,7 +72,7 @@ GEM
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.6)
+    rspec-core (3.1.7)
       rspec-support (~> 3.1.0)
     rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)

data/lib/pact/consumer/interaction_builder.rb

@@ -29,7 +29,7 @@ module Pact
       end
 
       def will_respond_with(response)
-        interaction.response = response
+        interaction.response = Pact::Response.new(response)
         @callback.call interaction
         self
       end

data/lib/pact/provider/configuration/configuration_extension.rb

@@ -37,15 +37,6 @@ module Pact
           @config_ru_path = config_ru_path
         end
 
-        def color_enabled
-          # Can't use ||= when the variable might be false, it will execute the expression if it's false
-          defined?(@color_enabled) ? @color_enabled : true
-        end
-
-        def color_enabled= color_enabled
-          @color_enabled = color_enabled
-        end
-
         def include mod
           Pact::Provider::State::ProviderStateConfiguredModules.instance_eval do
             include mod

data/lib/pact/version.rb

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

data/pact.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'webrick'
   gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
 
-  gem.add_runtime_dependency 'pact-support', '~> 0.0.3'
-  gem.add_runtime_dependency 'pact-mock_service', '~> 0.0.1'
+  gem.add_runtime_dependency 'pact-support', '~> 0.1.2'
+  gem.add_runtime_dependency 'pact-mock_service', '~> 0.1.0'
 
   gem.add_development_dependency 'rake', '~> 10.0.3'
   gem.add_development_dependency 'webmock', '~> 1.18.0'

data/spec/integration/consumer_with_form_hash_spec.rb

@@ -0,0 +1,62 @@
+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
+
+  let(:body) { 'That is some good Mallory.' }
+
+  context 'submitting a form specified as a Hash' do
+
+    before :all do
+      Pact.clear_configuration
+
+      Pact.service_consumer "Consumer" do
+        has_pact_with "Zebra Service" do
+          mock_service :zebra_service_4 do
+            port 1245
+          end
+        end
+      end
+    end
+
+    before do
+
+      zebra_service_4.
+        given("the zebras like using forms").
+        upon_receiving("a create Mallory request").with({
+          method: :post,
+          path: '/mallory',
+          headers: {'Content-Type' => 'application/x-www-form-urlencoded'},
+          body: {
+            param1: Pact::Term.new(generate: 'woger', matcher: /w/),
+            param2: 'penguin'
+          }
+        }).
+        will_respond_with({
+          status: 200
+      })
+
+    end
+
+    let(:url) { zebra_service_4.mock_service_base_url + "/mallory" }
+    let(:response) { Faraday.post url, param2: 'penguin', param1: 'wiffle' }
+    let(:pact_json) { response; zebra_service_4.write_pact }
+
+    it "matches form data" do
+      expect(response.status).to eq 200
+    end
+
+    it "does not include any Pact::Terms" do
+      expect(pact_json).to_not include "Pact::Term"
+    end
+
+    it "includes the reified form" do
+      expect(pact_json).to include "param1=woger"
+    end
+
+  end
+end

data/spec/integration/consumer_with_form_spec.rb

@@ -0,0 +1,50 @@
+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
+
+  let(:body) { 'That is some good Mallory.' }
+
+  context 'submitting a form' do
+
+    before :all do
+      Pact.clear_configuration
+
+      Pact.service_consumer "Consumer" do
+        has_pact_with "Zebra Service" do
+          mock_service :zebra_service_3 do
+            port 1243
+          end
+        end
+      end
+    end
+
+    before do
+
+      zebra_service_3.
+        given("the zebras like using forms").
+        upon_receiving("a create Mallory request").with({
+          method: :post,
+          path: '/mallory',
+          headers: {'Content-Type' => 'application/x-www-form-urlencoded'},
+          body: "param1=wiffle&param2=penguin"
+        }).
+        will_respond_with({
+          status: 200
+      })
+
+    end
+
+    let(:url) { zebra_service_3.mock_service_base_url + "/mallory" }
+
+    it "matches form data" do
+      response =  Faraday.post url, param2: 'penguin', param1: 'wiffle'
+      expect(response.status).to eq 200
+    end
+
+  end
+end

data/spec/integration/consumer_with_params_hash_spec.rb

@@ -10,10 +10,10 @@ 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)
+  def faraday_mallory(base_url,params, headers = {})
     (Faraday.new base_url, :request => {
        :params_encoder => Faraday::FlatParamsEncoder,
-    }).get '/mallory', params, {'Accept' => 'application/json'}
+    }).get '/mallory', params, {'Accept' => 'application/json'}.merge(headers)
   end
 
   let(:body) { 'That is some good Mallory.' }
@@ -77,7 +77,7 @@ describe "A service consumer side of a pact", :pact => true  do
 
   context "and a complex request matching Pact Terms and multiple instances of the same parameter" do
 
-    it "goes like this" do
+    before :all do
       Pact.clear_configuration
       Pact.service_consumer "Consumer" do
         has_pact_with "Zebra Service" do
@@ -87,13 +87,16 @@ describe "A service consumer side of a pact", :pact => true  do
           end
         end
       end
+    end
+
+    before do
       zebra_service.
         given(:the_zebras_are_here).
         upon_receiving("a retrieve Mallory request").
         with({
            method: :get,
            path: '/mallory',
-           headers: {'Accept' => 'application/json'},
+           headers: {'Accept' => 'application/json', 'Content-Type' => 'application/x-www-form-urlencoded'},
            query: { size: ['small',Pact::Term.new(matcher: /med.*/, generate: 'medium'),'large'], colour: 'brown', weight: '5'}
         }).
         will_respond_with({
@@ -101,11 +104,19 @@ describe "A service consumer side of a pact", :pact => true  do
           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
+    end
 
-      interactions = Pact::ConsumerContract.from_json(zebra_service.write_pact).interactions
-      expect(interactions.first.provider_state).to eq("the_zebras_are_here")
+    let(:response) do
+      faraday_mallory(
+        zebra_service.mock_service_base_url,
+        { weight: 5, size: ['small','medium','large'], colour: 'brown'},
+        {'Content-Type' => 'application/x-www-form-urlencoded'}
+      )
+    end
+
+    it "goes like this" do
+      expect(response.body).to eq body
     end
+
   end
 end

data/spec/lib/pact/provider/configuration/configuration_extension_spec.rb

@@ -11,20 +11,7 @@ module Pact
 
         subject { Object.new.extend(ConfigurationExtension) }
 
-        describe "#color_enabled" do
-
-          it "sets color_enabled to be true by default" do
-            expect(subject.color_enabled).to be true
-          end
-
-          it "allows configuration of colour_enabled" do
-            subject.color_enabled = false
-            expect(subject.color_enabled).to be false
-          end
-
-        end
-
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc3
+  version: 1.4.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-22 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.3
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: pact-mock_service
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -190,7 +190,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -423,6 +423,8 @@ files:
 - 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_form_hash_spec.rb
+- spec/integration/consumer_with_form_spec.rb
 - spec/integration/consumer_with_params_hash_spec.rb
 - spec/integration/pact/consumer_configuration_spec.rb
 - spec/integration/pact/provider_configuration_spec.rb
@@ -439,10 +441,7 @@ files:
 - spec/lib/pact/consumer/mock_service/interaction_replay_spec.rb
 - spec/lib/pact/consumer/mock_service/rack_request_helper_spec.rb
 - spec/lib/pact/consumer/mock_service/verification_get_spec.rb
-- spec/lib/pact/consumer/mock_service_client_spec.rb
-- spec/lib/pact/consumer/mock_service_interaction_expectation_spec.rb
 - spec/lib/pact/consumer/service_consumer_spec.rb
-- spec/lib/pact/consumer_contract/consumer_contract_writer_spec.rb
 - spec/lib/pact/doc/generator_spec.rb
 - spec/lib/pact/doc/interaction_view_model_spec.rb
 - spec/lib/pact/doc/markdown/consumer_contract_renderer_spec.rb
@@ -511,7 +510,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2688969630931365840
+      hash: 2889901042429282907
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -534,6 +533,8 @@ test_files:
 - 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_form_hash_spec.rb
+- spec/integration/consumer_with_form_spec.rb
 - spec/integration/consumer_with_params_hash_spec.rb
 - spec/integration/pact/consumer_configuration_spec.rb
 - spec/integration/pact/provider_configuration_spec.rb
@@ -550,10 +551,7 @@ test_files:
 - spec/lib/pact/consumer/mock_service/interaction_replay_spec.rb
 - spec/lib/pact/consumer/mock_service/rack_request_helper_spec.rb
 - spec/lib/pact/consumer/mock_service/verification_get_spec.rb
-- spec/lib/pact/consumer/mock_service_client_spec.rb
-- spec/lib/pact/consumer/mock_service_interaction_expectation_spec.rb
 - spec/lib/pact/consumer/service_consumer_spec.rb
-- spec/lib/pact/consumer_contract/consumer_contract_writer_spec.rb
 - spec/lib/pact/doc/generator_spec.rb
 - spec/lib/pact/doc/interaction_view_model_spec.rb
 - spec/lib/pact/doc/markdown/consumer_contract_renderer_spec.rb

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

@@ -1,88 +0,0 @@
-require 'spec_helper'
-require 'pact/consumer/mock_service_client'
-
-module Pact
-  module Consumer
-    describe MockServiceClient do
-
-      subject { MockServiceClient.new(4444) }
-
-      let(:administration_headers) { {'X-Pact-Mock-Service' => 'true'} }
-
-      describe "#add_expected_interaction" do
-        let(:interaction) { InteractionFactory.create }
-        let(:request_body) { MockServiceInteractionExpectation.new(interaction).to_json }
-
-        context "when successful" do
-          let!(:post_interaction) do
-            stub_request(:post, "localhost:4444/interactions").
-              with(body: request_body, headers: administration_headers.merge('Content-Type' => "application/json")).
-              to_return(status: 200)
-          end
-
-          it "sets up the expected interaction on the mock server" do
-            subject.add_expected_interaction interaction
-            expect(post_interaction).to have_been_made
-          end
-        end
-
-      end
-
-      describe "#verify" do
-
-        context "when all interactions are successfully verified" do
-
-          let!(:get_verification) do
-            stub_request(:get, "localhost:4444/interactions/verification?example_description=some%20example").
-              with(headers: administration_headers).
-              to_return(status: 200)
-          end
-
-          it "does not throw an error" do
-            subject.verify "some example"
-            expect(get_verification).to have_been_made
-          end
-        end
-      end
-
-      describe ".clear_interactions" do
-        let!(:delete_verifications) do
-          stub_request(:delete, "localhost:4444/interactions?example_description=some%20example").
-            with(headers: administration_headers).
-            to_return(status: 200)
-        end
-
-        it "deletes the interactions" do
-          MockServiceClient.clear_interactions 4444, "some example"
-          expect(delete_verifications).to have_been_made
-        end
-      end
-
-      describe "#write_pact" do
-        let(:consumer_contract_details) { {consumer: {name: 'Consumer'}, provider: {name: 'Provider'}, pactfile_write_mode: 'update'} }
-        let(:pact) { {a: 'pact'}.to_json }
-
-        let!(:post_pact) do
-          stub_request(:post, "localhost:4444/pact").
-            with(headers: administration_headers.merge('Content-Type' => "application/json"), body: consumer_contract_details).
-            to_return(status: 200, body: pact)
-        end
-
-        it "deletes the interactions" do
-          expect(subject.write_pact(consumer_contract_details)).to eq pact
-          expect(post_pact).to have_been_made
-        end
-
-      end
-
-      describe "#log" do
-        it "sends a log request to the mock server"
-      end
-
-      describe "#wait_for_interactions" do
-        it "waits until there are no missing interactions"
-      end
-    end
-  end
-end
-

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

@@ -1,54 +0,0 @@
-require 'spec_helper'
-require 'pact/consumer/mock_service_interaction_expectation'
-
-describe Pact::Consumer::MockServiceInteractionExpectation do
-  describe "as_json" do
-
-    let(:options ) { {} }
-    let(:request_as_json) { {a: 'request'} }
-    let(:request) { instance_double('Pact::Request::Expected', :as_json => request_as_json, :options => options)}
-    let(:response) { double('response') }
-    let(:generated_response ) { double('generated_response', :to_json => 'generated_response') }
-    let(:interaction) { instance_double('Pact::Interaction', :description => 'description', :request => request, :response => response, :provider_state => 'some state') }
-    subject { described_class.new(interaction)}
-    let(:expected_hash) { {:response => generated_response, :request => as_json_with_options, :description => '' } }
-
-    before do
-      allow(Pact::Reification).to receive(:from_term).with(response).and_return(generated_response)
-    end
-
-    it "includes the response" do
-      expect(subject.as_json[:response]).to eq response
-    end
-
-    it "includes the options in the request" do
-      expect(subject.as_json[:request]).to eq request_as_json
-    end
-
-    it "includes the provider state" do
-      expect(subject.as_json[:provider_state]).to eq 'some state'
-    end
-
-    it "includes the description" do
-      expect(subject.as_json[:description]).to eq 'description'
-    end
-
-    it "doesn't have any other keys" do
-      expect(subject.as_json.keys).to eq [:description, :provider_state, :request, :response]
-    end
-
-    context "without options" do
-      it "does not include the options key" do
-        expect(subject.as_json.key?(:options)).to be false
-      end
-    end
-
-    context "with options" do
-      let(:options) { {:opts => 'blah'} }
-      it "includes the options in the request hash" do
-        expect(subject.as_json[:request][:options]).to eq options
-      end
-    end
-  end
-
-end

data/spec/lib/pact/consumer_contract/consumer_contract_writer_spec.rb

@@ -1,111 +0,0 @@
-require 'spec_helper'
-require 'pact/consumer_contract/consumer_contract_writer'
-
-module Pact
-
-  describe ConsumerContractWriter do
-
-    let(:support_pact_file) { './spec/support/a_consumer-a_provider.json' }
-    let(:consumer_name) { 'a consumer' }
-    let(:provider_name) { 'a provider' }
-
-    before do
-      Pact.clear_configuration
-      allow(Pact.configuration).to receive(: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(:existing_interactions) { ConsumerContract.from_json(File.read(support_pact_file)).interactions }
-    let(:new_interactions) { [InteractionFactory.create] }
-    let(:tmp_pact_dir) {"./tmp/pacts"}
-    let(:logger) { double("logger").as_null_object }
-    let(:pactfile_write_mode) {:overwrite}
-    let(:consumer_contract_details) {
-      {
-          consumer: {name: consumer_name},
-          provider: {name: provider_name},
-          pactfile_write_mode: pactfile_write_mode,
-          interactions: new_interactions
-      }
-    }
-
-    let(:consumer_contract_writer) { ConsumerContractWriter.new(consumer_contract_details, logger) }
-
-    describe "consumer_contract" do
-
-      let(:subject) { consumer_contract_writer.consumer_contract }
-
-      context "when overwriting pact" do
-
-        it "it uses only the interactions from the current test run" do
-          expect(consumer_contract_writer.consumer_contract.interactions).to eq new_interactions
-        end
-
-      end
-
-      context "when updating pact" do
-
-        let(:pactfile_write_mode) {:update}
-
-        it "merges the interactions from the current test run with the interactions from the existing file" do
-          allow_any_instance_of(ConsumerContractWriter).to receive(:info_and_puts)
-          expect(consumer_contract_writer.consumer_contract.interactions).to eq  existing_interactions + new_interactions
-        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
-          expect($stdout).to receive(:puts).with(line0).twice
-          expect($stdout).to receive(:puts).with(line1)
-          expect($stdout).to receive(:puts).with(line2)
-          expect($stdout).to receive(:puts).with(line3)
-          expect(logger).to receive(:info).with(line0).twice
-          expect(logger).to receive(:info).with(line1)
-          expect(logger).to receive(:info).with(line2)
-          expect(logger).to receive(:info).with(line3)
-          consumer_contract_writer.consumer_contract
-        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
-          allow(ConsumerContract).to receive(:from_json).and_raise(error)
-          allow($stderr).to receive(:puts)
-          allow(logger).to receive(:puts)
-        end
-
-        it "logs the error" do
-          expect($stderr).to receive(:puts).with(line1)
-          expect($stderr).to receive(:puts).with(line2)
-          expect(logger).to receive(:warn).with(line1)
-          expect(logger).to receive(:warn).with(line2)
-          consumer_contract_writer.consumer_contract
-        end
-
-        it "uses the new interactions" do
-          expect(consumer_contract_writer.consumer_contract.interactions).to eq new_interactions
-        end
-      end
-    end
-
-    describe "write" do
-      it "writes the pact file" do
-        expect_any_instance_of(ConsumerContract).to receive(:update_pactfile)
-        consumer_contract_writer.write
-      end
-    end
-
-  end
-
-end