pact 1.0.10 → 1.0.11

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 1.0.11 (26 September 2014)
+* Added X-Pact-Mock-Service headers to all mock service administration requests, reducing the risk of the client project making a request that is unintentionally intercepted by the mock service administration handlers. [Beth Skurrie]
+
 ### 1.0.10 (24 September 2014)
 * Removing unused requires [Beth Skurrie, 20 hours ago]
 * Adding example changes [Beth Skurrie, 20 hours ago]
@@ -15,8 +18,9 @@
 * Moving request file into consumer_contract folder. [Beth Skurrie, 7 days ago]
 * Symbolizing keys so from_hash does not have to duplicate so much of the constructor methods. Service provider is now mandatory. [Beth Skurrie, 7 days ago]
 * Removed Hashie from run time dependencies. [Beth Skurrie, 7 days ago]
-* Starting to clean up mock service. Adding integration tests for failure scenarios. (Beth Skurrie, 7 days ago]
+* Starting to clean up mock service. Adding integration tests for failure scenarios. [Beth Skurrie, 7 days ago]
 * Added RSpec fire to ensure stubbed methods exist. Pulled the recreation of a repayable request from an expected request out of the TestHelper into its own class. [Beth Skurrie, 7 days ago]
+* Fixed problem where methods in previous scope could not be accessed by the DSL delegator [Beth Skurrie]
 
 ### 1.0.9 (16 September 2013)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact (1.0.10)
+    pact (1.0.11)
       awesome_print (~> 1.1.0)
       find_a_port (~> 1.0.1)
       json
@@ -47,6 +47,8 @@ GEM
     rspec-core (2.14.5)
     rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
+    rspec-fire (1.2.0)
+      rspec (~> 2.11)
     rspec-mocks (2.14.3)
     safe_yaml (0.9.5)
     slop (3.4.6)
@@ -69,4 +71,5 @@ DEPENDENCIES
   pact!
   pry
   rake (~> 10.0.3)
+  rspec-fire
   webmock (~> 1.9.3)

data/lib/pact/consumer/app_manager.rb

@@ -83,7 +83,7 @@ module Pact
           lower_case_name.gsub('_service', '_mock_service')
         else
           lower_case_name + '_mock_service'
-        end        
+        end
       end
 
       def app_registrations

data/lib/pact/consumer/consumer_contract_builder.rb

@@ -47,6 +47,10 @@ module Pact
         mock_service_client.verify example_description
       end
 
+      def log msg
+        mock_service_client.log msg
+      end
+
       def wait_for_interactions options
         wait_max_seconds = options.fetch(:wait_max_seconds, 3)
         poll_interval = options.fetch(:poll_interval, 0.1)

data/lib/pact/consumer/mock_service/app.rb

@@ -5,12 +5,12 @@ require 'awesome_print'
 require 'awesome_print/core_ext/logger' #For some reason we get an error indicating that the method 'ap' is private unless we load this specifically
 require 'pact/consumer/request'
 require 'pact/consumer/mock_service/interaction_list'
-require 'pact/consumer/mock_service/startup_poll'
 require 'pact/consumer/mock_service/interaction_delete'
 require 'pact/consumer/mock_service/interaction_post'
 require 'pact/consumer/mock_service/interaction_replay'
 require 'pact/consumer/mock_service/missing_interactions_get'
 require 'pact/consumer/mock_service/verification_get'
+require 'pact/consumer/mock_service/log_get'
 
 AwesomePrint.defaults = {
   indent: -2,
@@ -38,11 +38,11 @@ module Pact
 
         @name = options.fetch(:name, "MockService")
         @handlers = [
-          StartupPoll.new(@name, @logger),
           MissingInteractionsGet.new(@name, @logger, interaction_list),
-          VerificationGet.new(@name, @logger, log_description, interaction_list),
+          VerificationGet.new(@name, @logger, interaction_list, log_description),
           InteractionPost.new(@name, @logger, interaction_list),
           InteractionDelete.new(@name, @logger, interaction_list),
+          LogGet.new(@name, @logger),
           InteractionReplay.new(@name, @logger, interaction_list)
         ]
       end

data/lib/pact/consumer/mock_service/interaction_delete.rb

@@ -1,26 +1,31 @@
 require 'pact/consumer/mock_service/rack_request_helper'
+require 'pact/consumer/mock_service/mock_service_administration_endpoint'
 
 module Pact
   module Consumer
 
-    class InteractionDelete
+    class InteractionDelete < MockServiceAdministrationEndpoint
 
       include RackRequestHelper
 
+      attr_accessor :interaction_list
+
       def initialize name, logger, interaction_list
-        @name = name
-        @logger = logger
+        super name, logger
         @interaction_list = interaction_list
       end
 
-      def match? env
-        env['REQUEST_PATH'].start_with?('/interactions') &&
-          env['REQUEST_METHOD'] == 'DELETE'
+      def request_path
+        '/interactions'
+      end
+
+      def request_method
+        'DELETE'
       end
 
       def respond env
-        @interaction_list.clear
-        @logger.info "Cleared interactions before example \"#{params_hash(env)['example_description']}\""
+        interaction_list.clear
+        logger.info "Cleared interactions before example \"#{params_hash(env)['example_description']}\""
         [200, {}, ['Deleted interactions']]
       end
     end

data/lib/pact/consumer/mock_service/interaction_post.rb

@@ -1,23 +1,29 @@
+require 'pact/consumer/mock_service/mock_service_administration_endpoint'
+
 module Pact
   module Consumer
-    class InteractionPost
+    class InteractionPost < MockServiceAdministrationEndpoint
+
+      attr_accessor :interaction_list
 
       def initialize name, logger, interaction_list
-        @name = name
-        @logger = logger
+        super name, logger
         @interaction_list = interaction_list
       end
 
-      def match? env
-        env['REQUEST_PATH'] == '/interactions' &&
-          env['REQUEST_METHOD'] == 'POST'
+      def request_path
+        '/interactions'
+      end
+
+      def request_method
+        'POST'
       end
 
       def respond env
         interaction = Interaction.from_hash(JSON.load(env['rack.input'].string))
-        @interaction_list.add interaction
-        @logger.info "Registered expected interaction #{interaction.request.method_and_path} for #{@name}"
-        @logger.ap interaction.as_json
+        interaction_list.add interaction
+        logger.info "Registered expected interaction #{interaction.request.method_and_path} for #{name}"
+        logger.ap interaction.as_json
         [200, {}, ['Added interactions']]
       end
     end

data/lib/pact/consumer/mock_service/interaction_replay.rb

@@ -8,6 +8,8 @@ module Pact
       include Pact::Matchers
       include RackRequestHelper
 
+      attr_accessor :name, :logger, :interaction_list
+
       def initialize name, logger, interaction_list
         @name = name
         @logger = logger
@@ -26,9 +28,9 @@ module Pact
 
       def find_response request_hash
         actual_request = Request::Actual.from_hash(request_hash)
-        @logger.info "#{@name} received request #{actual_request.method_and_path}"
-        @logger.ap actual_request.as_json
-        candidate_interactions = @interaction_list.find_candidate_interactions actual_request
+        logger.info "#{name} received request #{actual_request.method_and_path}"
+        logger.ap actual_request.as_json
+        candidate_interactions = interaction_list.find_candidate_interactions actual_request
         matching_interactions = find_matching_interactions actual_request, from: candidate_interactions
 
         case matching_interactions.size
@@ -43,28 +45,28 @@ module Pact
         candidate_interactions = opts.fetch(:from)
         candidate_interactions.select do | candidate_interaction |
           candidate_interaction.request.matches? actual_request
-        end        
-      end 
+        end
+      end
 
       def handle_matched_interaction interaction
-        @interaction_list.register_matched interaction
+        interaction_list.register_matched interaction
         response = response_from(interaction.response)
-        @logger.info "Found matching response on #{@name}:"
-        @logger.ap interaction.response
-        response        
+        logger.info "Found matching response on #{name}:"
+        logger.ap interaction.response
+        response
       end
 
       def multiple_interactions_found_response actual_request, matching_interactions
         response = {
-          message: "Multiple interaction found for #{actual_request.method_and_path}", 
+          message: "Multiple interaction found for #{actual_request.method_and_path}",
           matching_interactions:  matching_interactions.collect{ | interaction | request_summary_for(interaction) }
         }
         [500, {'Content-Type' => 'application/json'}, [response.to_json]]
       end
 
       def handle_more_than_one_matching_interaction actual_request, matching_interactions
-        @logger.error "Multiple interactions found on #{@name}:"
-        @logger.ap matching_interactions.collect(&:as_json)
+        logger.error "Multiple interactions found on #{name}:"
+        logger.ap matching_interactions.collect(&:as_json)
         multiple_interactions_found_response actual_request, matching_interactions
       end
 
@@ -72,7 +74,7 @@ module Pact
         candidate_interactions.collect do | candidate_interaction |
           diff = candidate_interaction.request.difference(actual_request)
           diff_summary_for candidate_interaction, diff
-        end        
+        end
       end
 
       def diff_summary_for interaction, diff
@@ -90,20 +92,20 @@ module Pact
 
       def unrecognised_request_response actual_request, interaction_diffs
         response = {
-          message: "No interaction found for #{actual_request.method_and_path}", 
+          message: "No interaction found for #{actual_request.method_and_path}",
           interaction_diffs:  interaction_diffs
         }
         [500, {'Content-Type' => 'application/json'}, [response.to_json]]
       end
 
       def log_unrecognised_request_and_interaction_diff actual_request, interaction_diffs, candidate_interactions
-        @logger.error "No interaction found on #{@name} for #{actual_request.method_and_path}"
-        @logger.error 'Interaction diffs for that route:'
-        @logger.ap(interaction_diffs, :error)        
+        logger.error "No interaction found on #{name} for #{actual_request.method_and_path}"
+        logger.error 'Interaction diffs for that route:'
+        logger.ap(interaction_diffs, :error)
       end
 
       def handle_unrecognised_request actual_request, candidate_interactions
-        @interaction_list.register_unexpected_request actual_request
+        interaction_list.register_unexpected_request actual_request
         interaction_diffs = interaction_diffs(actual_request, candidate_interactions)
         log_unrecognised_request_and_interaction_diff actual_request, interaction_diffs, candidate_interactions
         unrecognised_request_response actual_request, interaction_diffs
@@ -119,7 +121,7 @@ module Pact
       end
 
       def logger_info_ap msg
-        @logger.info msg
+        logger.info msg
       end
     end
   end

data/lib/pact/consumer/mock_service/log_get.rb

@@ -0,0 +1,28 @@
+require 'pact/consumer/mock_service/mock_service_administration_endpoint'
+
+module Pact
+  module Consumer
+    class LogGet < MockServiceAdministrationEndpoint
+
+      include RackRequestHelper
+
+      def request_path
+        '/log'
+      end
+
+      def request_method
+        'GET'
+      end
+
+
+      def respond env
+        logger.info "Debug message from client - #{message(env)}"
+        [200, {}, []]
+      end
+
+      def message env
+        params_hash(env)['msg']
+      end
+    end
+  end
+end

data/lib/pact/consumer/mock_service/missing_interactions_get.rb

@@ -1,23 +1,27 @@
+require 'pact/consumer/mock_service/mock_service_administration_endpoint'
+
 module Pact
   module Consumer
 
-    class MissingInteractionsGet
+    class MissingInteractionsGet < MockServiceAdministrationEndpoint
       include RackRequestHelper
 
       def initialize name, logger, interaction_list
-        @name = name
-        @logger = logger
+        super name, logger
         @interaction_list = interaction_list
       end
 
-      def match? env
-        env['REQUEST_PATH'].start_with?('/number_of_missing_interactions') &&
-            env['REQUEST_METHOD'] == 'GET'
+      def request_path
+        '/number_of_missing_interactions'
+      end
+
+      def request_method
+        'GET'
       end
 
       def respond env
         number_of_missing_interactions = @interaction_list.missing_interactions.size
-        @logger.info "Number of missing interactions for mock \"#{@name}\" = #{number_of_missing_interactions}"
+        logger.info "Number of missing interactions for mock \"#{name}\" = #{number_of_missing_interactions}"
         [200, {}, ["#{number_of_missing_interactions}"]]
       end
 

data/lib/pact/consumer/mock_service/mock_service_administration_endpoint.rb

@@ -0,0 +1,31 @@
+require 'pact/consumer/mock_service/rack_request_helper'
+module Pact
+  module Consumer
+    class MockServiceAdministrationEndpoint
+
+      attr_accessor :logger, :name
+
+      def initialize name, logger
+        @name = name
+        @logger = logger
+      end
+
+      include RackRequestHelper
+
+      def match? env
+        headers_from(env)['X-Pact-Mock-Service'] &&
+        env['REQUEST_PATH'] == request_path &&
+          env['REQUEST_METHOD'] == request_method
+      end
+
+      def request_path
+        raise NotImplementedError
+      end
+
+      def request_method
+        raise NotImplementedError
+      end
+
+    end
+  end
+end

data/lib/pact/consumer/mock_service/verification_get.rb

@@ -1,29 +1,34 @@
+require 'pact/consumer/mock_service/mock_service_administration_endpoint'
+
 module Pact
   module Consumer
-    class VerificationGet
+    class VerificationGet < MockServiceAdministrationEndpoint
 
       include RackRequestHelper
+      attr_accessor :interaction_list, :log_description
 
-      def initialize name, logger, log_description, interaction_list
-        @name = name
-        @logger = logger
-        @log_description = log_description
+      def initialize name, logger, interaction_list, log_description
+        super name, logger
         @interaction_list = interaction_list
+        @log_description = log_description
+      end
+
+      def request_path
+        '/verify'
       end
 
-      def match? env
-        env['REQUEST_PATH'].start_with?('/verify') &&
-          env['REQUEST_METHOD'] == 'GET'
+      def request_method
+        'GET'
       end
 
       def respond env
-        if @interaction_list.all_matched?
-          @logger.info "Verifying - interactions matched for example \"#{example_description(env)}\""
+        if interaction_list.all_matched?
+          logger.info "Verifying - interactions matched for example \"#{example_description(env)}\""
           [200, {}, ['Interactions matched']]
         else
-          @logger.warn "Verifying - actual interactions do not match expected interactions for example \"#{example_description(env)}\". Interaction diffs:"
-          @logger.ap @interaction_list.interaction_diffs, :warn
-          [500, {}, ["Actual interactions do not match expected interactions for mock #{@name}. See #{@log_description} for details."]]
+          logger.warn "Verifying - actual interactions do not match expected interactions for example \"#{example_description(env)}\". Interaction diffs:"
+          logger.ap interaction_list.interaction_diffs, :warn
+          [500, {}, ["Actual interactions do not match expected interactions for mock #{name}. See #{log_description} for details."]]
         end
       end
 

data/lib/pact/consumer/mock_service_client.rb

@@ -3,32 +3,39 @@ require 'pact/consumer/mock_service_interaction_expectation'
 module Pact
   module Consumer
     class MockServiceClient
+
+      MOCK_SERVICE_ADMINISTRATON_HEADERS = {'X-Pact-Mock-Service' => 'true'}
+
       def initialize name, port
         @http = Net::HTTP.new('localhost', port)
       end
 
       def verify example_description
-        response = http.request_get("/verify?example_description=#{URI.encode(example_description)}")
+        response = http.request_get("/verify?example_description=#{URI.encode(example_description)}", MOCK_SERVICE_ADMINISTRATON_HEADERS)
         raise response.body unless response.is_a? Net::HTTPSuccess
       end
 
+      def log msg
+        http.request_get("/log?msg=#{URI.encode(msg)}", MOCK_SERVICE_ADMINISTRATON_HEADERS)
+      end
+
       def wait_for_interactions wait_max_seconds, poll_interval
         wait_until_true(wait_max_seconds, poll_interval) do
-          response = http.request_get("/number_of_missing_interactions")
+          response = http.request_get("/number_of_missing_interactions", MOCK_SERVICE_ADMINISTRATON_HEADERS)
           response.body == '0'
         end
       end
 
       def clear_interactions example_description
-        http.delete("/interactions?example_description=#{URI.encode(example_description)}")
+        http.delete("/interactions?example_description=#{URI.encode(example_description)}", MOCK_SERVICE_ADMINISTRATON_HEADERS)
       end
 
       def add_expected_interaction interaction
-        http.request_post('/interactions', MockServiceInteractionExpectation.new(interaction).to_json)
+        http.request_post('/interactions', MockServiceInteractionExpectation.new(interaction).to_json, MOCK_SERVICE_ADMINISTRATON_HEADERS)
       end
 
       def self.clear_interactions port, example_description
-        Net::HTTP.new("localhost", port).delete("/interactions?example_description=#{URI.encode(example_description)}")
+        Net::HTTP.new("localhost", port).delete("/interactions?example_description=#{URI.encode(example_description)}", MOCK_SERVICE_ADMINISTRATON_HEADERS)
       end
 
       private

data/lib/pact/shared/dsl.rb

@@ -1,20 +1,53 @@
 require 'delegate'
 
 module Pact
+
+  class DslDelegator < SimpleDelegator
+    def instance_eval_with_previous_context_available(*args, &b)
+      meth = self.class.class_eval do
+        define_method :cloaker_, &b
+        meth = instance_method :cloaker_
+        remove_method :cloaker_
+        meth
+      end
+      with_previous_context(b.binding) {meth.bind(self).call(*args)}
+    end
+
+    def with_previous_context(binding, &block)
+      @previous_context = binding.eval('self')
+      result = block.call
+      @previous_context = nil
+      result
+    end
+
+    def method_missing(method, *args, &block)
+      if __getobj__().respond_to? method
+        super
+      elsif @previous_context
+        @previous_context.send(method, *args, &block)
+      else
+        super
+      end
+    end
+  end
+
+
   # Ripped from http://blog.joecorcoran.co.uk/2013/09/04/simple-pattern-ruby-dsl
+  # and then fixed up by using http://www.skorks.com/2013/03/a-closure-is-not-always-a-closure-in-ruby/
+  # to access variables and methods defined in the calling scope.
   module DSL
     def build(*args, &block)
       base = self.new(*args)
-      delegator_klass = self.const_get('DSLDelegator')
+      delegator_klass = self.const_get('DSL_DELEGATOR')
       delegator = delegator_klass.new(base)
-      delegator.instance_eval(&block)
+      delegator.instance_eval_with_previous_context_available(&block)
       base.finalize
       base
     end
 
     def dsl(&block)
-      delegator_klass = Class.new(SimpleDelegator, &block)
-      self.const_set('DSLDelegator', delegator_klass)
+      delegator_klass = Class.new(DslDelegator, &block)
+      self.const_set('DSL_DELEGATOR', delegator_klass)
     end
   end
 end

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end

data/pact.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'fakefs', '~> 0.4'
   gem.add_development_dependency 'hashie', '~> 2.0'
+  gem.add_development_dependency 'rspec-fire'
 end

data/spec/integration/consumer_spec.rb

@@ -5,7 +5,7 @@ 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 
+    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
 
@@ -48,20 +48,20 @@ describe "A service consumer side of a pact", :pact => true  do
 
   context "with no matching interaction found" do
 
-    let(:expected_response) do 
+    let(:expected_response) do
       {
-        "message"=>"No interaction found for GET /path", 
+        "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", 
+              "expected"=>"some body",
               "actual"=>"not matching body"
             }
           }
         }]
-      } 
+      }
     end
 
     it "returns an error" do
@@ -132,7 +132,7 @@ describe "A service consumer side of a pact", :pact => true  do
     before do
       Pact.clear_configuration
 
-      Pact.service_consumer "Consumer" do | config |
+      Pact.service_consumer "Consumer" do
         has_pact_with "Zebra Service" do
           mock_service :zebra_service do
             verify true

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

@@ -8,9 +8,10 @@ module Pact::Consumer::Configuration
          Pact.clear_configuration
          Pact::Consumer::AppManager.instance.stub(:register_mock_service_for)
       end
+
       describe "configure_consumer_contract_builder" do
          let(:consumer_name) {'consumer'}
-         subject { 
+         subject {
             MockService.build :mock_service, consumer_name, provider_name do
                port 1234
                standalone true
@@ -36,18 +37,18 @@ module Pact::Consumer::Configuration
             end
          end
          context "when not standalone" do
-            subject { 
+            subject {
                MockService.build :mock_service, consumer_name, provider_name do
                   port 1234
                   standalone false
                   verify true
                end
-            }            
+            }
             it "registers the app with the AppManager" do
                Pact::Consumer::AppManager.instance.should_receive(:register_mock_service_for).with(provider_name, url)
                subject.finalize
             end
-         end         
+         end
       end
    end
 end

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

@@ -0,0 +1,44 @@
+require 'spec_helper'
+require 'pact/shared/dsl'
+
+module Pact
+  describe DSL do
+
+    class TestDSL
+      extend DSL
+      attr_accessor :thing, :blah, :finally
+
+      dsl do
+        def with_thing thing
+          self.thing = thing
+        end
+        def with_blah blah
+          self.blah = blah
+        end
+      end
+
+      def finalize
+        @finally = 'yay'
+      end
+    end
+
+    describe "build" do
+       it "should support calling other variables and methods in scope" do
+          def my_method
+             'LA LA LA'
+          end
+
+          my_local_var = 123
+
+          test = TestDSL.build do
+            with_thing my_method
+            with_blah my_local_var
+          end
+
+          expect(test.thing).to eq my_method
+          expect(test.blah).to eq my_local_var
+          expect(test.finally).to eq 'yay'
+       end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -239,6 +239,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-fire
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Define a pact between service consumers and providers
 email:
 - james.fraser@alumni.swinburne.edu
@@ -289,9 +305,10 @@ files:
 - lib/pact/consumer/mock_service/interaction_list.rb
 - lib/pact/consumer/mock_service/interaction_post.rb
 - lib/pact/consumer/mock_service/interaction_replay.rb
+- lib/pact/consumer/mock_service/log_get.rb
 - lib/pact/consumer/mock_service/missing_interactions_get.rb
+- lib/pact/consumer/mock_service/mock_service_administration_endpoint.rb
 - lib/pact/consumer/mock_service/rack_request_helper.rb
-- lib/pact/consumer/mock_service/startup_poll.rb
 - lib/pact/consumer/mock_service/verification_get.rb
 - lib/pact/consumer/mock_service_client.rb
 - lib/pact/consumer/mock_service_interaction_expectation.rb
@@ -367,6 +384,7 @@ files:
 - spec/lib/pact/provider/rspec_spec.rb
 - spec/lib/pact/provider/test_methods_spec.rb
 - spec/lib/pact/reification_spec.rb
+- spec/lib/pact/shared/dsl_spec.rb
 - spec/lib/pact/term_spec.rb
 - spec/lib/pact/verification_task_spec.rb
 - spec/spec_helper.rb
@@ -434,6 +452,7 @@ test_files:
 - spec/lib/pact/provider/rspec_spec.rb
 - spec/lib/pact/provider/test_methods_spec.rb
 - spec/lib/pact/reification_spec.rb
+- spec/lib/pact/shared/dsl_spec.rb
 - spec/lib/pact/term_spec.rb
 - spec/lib/pact/verification_task_spec.rb
 - spec/spec_helper.rb

data/lib/pact/consumer/mock_service/startup_poll.rb

@@ -1,22 +0,0 @@
-module Pact
-  module Consumer
-
-    class StartupPoll
-
-      def initialize name, logger
-        @name = name
-        @logger = logger
-      end
-
-      def match? env
-        env['REQUEST_PATH'] == '/index.html' &&
-          env['REQUEST_METHOD'] == 'GET'
-      end
-
-      def respond env
-        @logger.info "#{@name} started up"
-        [200, {}, ['Started up fine']]
-      end
-    end
-  end
-end