pact 1.3.1 → 1.3.2

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 1.3.2 (20 August 2014)
+
+* 65e1e23 - Renamed memoised :options to :diff_options because it clashes with the HTTP options method (bethesque, Wed Aug 20 09:31:0
+* ca883a8 - Made options optional for ConsumerContactBuilder.wait_for_interactions (bethesque, Mon Aug 18 15:53:47 2014 +1000)
+
 ### 1.3.1 (11 August 2014)
 
 * 3432259 - Fixed 'pact:verify broken with rspec-core 3.0.3'  https://github.com/realestate-com-au/pact/issues/44 (bethesque, Mon Aug 11 10:14:42 2014 +1000)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact (1.3.1)
+    pact (1.3.2)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json
@@ -50,21 +50,21 @@ GEM
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
       rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.3)
+    rspec-core (3.0.4)
       rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.3)
+    rspec-expectations (3.0.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.3)
+    rspec-mocks (3.0.4)
       rspec-support (~> 3.0.0)
-    rspec-support (3.0.3)
+    rspec-support (3.0.4)
     safe_yaml (1.0.3)
     slop (3.5.0)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.4)
-    tins (1.3.0)
+    tins (1.3.2)
     tzinfo (1.2.1)
       thread_safe (~> 0.1)
     webmock (1.18.0)

data/lib/pact/consumer/consumer_contract_builder.rb

@@ -55,7 +55,7 @@ module Pact
         mock_service_client.write_pact @consumer_contract_details
       end
 
-      def wait_for_interactions options
+      def wait_for_interactions options = {}
         wait_max_seconds = options.fetch(:wait_max_seconds, 3)
         poll_interval = options.fetch(:poll_interval, 0.1)
         mock_service_client.wait_for_interactions wait_max_seconds, poll_interval
@@ -71,54 +71,6 @@ module Pact
       attr_reader :mock_service_client
       attr_writer :interaction_builder
 
-      # def interactions_for_new_consumer_contract pactfile_write_mode
-      #   pactfile_write_mode == :update ? existing_interactions : []
-      # end
-
-      # def filter interactions, pactfile_write_mode
-      #   if pactfile_write_mode == :update
-      #     UpdatableInteractionsFilter.new(interactions)
-      #   else
-      #     DistinctInteractionsFilter.new(interactions)
-      #   end
-      # end
-
-      # def warn_and_stderr msg
-      #   Pact.configuration.error_stream.puts msg
-      #   logger.warn msg
-      # end
-
-      # def info_and_puts msg
-      #   $stdout.puts msg
-      #   logger.info msg
-      # end
-
-      # def existing_interactions
-      #   interactions = []
-      #   if pactfile_exists?
-      #     begin
-      #       interactions = existing_consumer_contract.interactions
-      #       info_and_puts "*****************************************************************************"
-      #       info_and_puts "Updating existing file .#{consumer_contract.pactfile_path.gsub(Dir.pwd, '')} as config.pactfile_write_mode is :update"
-      #       info_and_puts "Only interactions defined in this test run will be updated."
-      #       info_and_puts "As interactions are identified by description and provider state, pleased note that if either of these have changed, the old interactions won't be removed from the pact file until the specs are next run with :pactfile_write_mode => :overwrite."
-      #       info_and_puts "*****************************************************************************"
-      #     rescue StandardError => e
-      #       warn_and_stderr "Could not load existing consumer contract from #{consumer_contract.pactfile_path} due to #{e}"
-      #       warn_and_stderr "Creating a new file."
-      #     end
-      #   end
-      #   interactions
-      # end
-
-      # def pactfile_exists?
-      #   File.exist?(consumer_contract.pactfile_path)
-      # end
-
-      # def existing_consumer_contract
-      #   Pact::ConsumerContract.from_uri(consumer_contract.pactfile_path)
-      # end
-
     end
   end
 end

data/lib/pact/provider/rspec.rb

@@ -111,7 +111,7 @@ module Pact
             let(:expected_content_type) { Pact::Headers.new(expected_response['headers'] || {})['Content-Type'] }
             let(:actual_content_type) { response.headers['Content-Type']}
             let(:diff_content_type) { String === expected_content_type ? expected_content_type : actual_content_type } # expected_content_type may be a Regexp
-            let(:options) { { with: differ, diff_formatter: diff_formatter } }
+            let(:diff_options) { { with: differ, diff_formatter: diff_formatter } }
 
             if expected_response['status']
               it "has status code #{expected_response['status']}" do
@@ -132,7 +132,7 @@ module Pact
 
             if expected_response['body']
               it "has a matching body" do
-                expect(response_body).to match_term expected_response_body, options
+                expect(response_body).to match_term expected_response_body, diff_options
               end
             end
           end

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/spec/support/options.json

@@ -0,0 +1,21 @@
+{
+    "consumer": {
+        "name": "Consumer"
+    },
+    "provider": {
+        "name": "Provider"
+    },
+    "interactions": [
+        {
+            "description": "an OPTIONS request",
+            "request": {
+                "method": "options",
+                "path": "/"
+            },
+            "response": {
+                "status": 200
+            },
+            "provider_state": null
+        }
+    ]
+}

data/spec/support/options_app.rb

@@ -0,0 +1,15 @@
+require 'pact/provider/rspec'
+
+class App
+  def self.call env
+    if env['REQUEST_METHOD'] == 'OPTIONS'
+      [200, {}, []]
+    else
+      [500, {}, ["Expected an options request"]]
+    end
+  end
+end
+
+Pact.service_provider 'Provider' do
+  app { App }
+end

data/tasks/pact-test.rake

@@ -5,6 +5,10 @@ Pact::VerificationTask.new(:stubbing) do | pact |
 	pact.uri './spec/support/stubbing.json', :pact_helper => './spec/support/stubbing_using_allow.rb'
 end
 
+Pact::VerificationTask.new(:options) do | pact |
+	pact.uri './spec/support/options.json', :pact_helper => './spec/support/options_app.rb'
+end
+
 Pact::VerificationTask.new(:pass) do | pact |
 	pact.uri './spec/support/test_app_pass.json'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -532,6 +532,8 @@ files:
 - spec/support/interaction_view_model_with_terms.json
 - spec/support/markdown_pact.json
 - spec/support/missing_provider_states_output.txt
+- spec/support/options.json
+- spec/support/options_app.rb
 - spec/support/pact_helper.rb
 - spec/support/shared_examples_for_request.rb
 - spec/support/spec_support.rb
@@ -558,7 +560,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1965962411134089782
+      hash: -3697299514790813108
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -567,7 +569,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1965962411134089782
+      hash: -3697299514790813108
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -664,6 +666,8 @@ test_files:
 - spec/support/interaction_view_model_with_terms.json
 - spec/support/markdown_pact.json
 - spec/support/missing_provider_states_output.txt
+- spec/support/options.json
+- spec/support/options_app.rb
 - spec/support/pact_helper.rb
 - spec/support/shared_examples_for_request.rb
 - spec/support/spec_support.rb