pact 1.0.34 → 1.0.35

data/CHANGELOG.md

@@ -2,11 +2,19 @@ Do this to generate your change history
 
     git log --date=relative --pretty=format:'  * %h - %s (%an, %ad)'
 
-### 1.0.34 (17 March 2013)
+### 1.0.35 (19 March 2014)
+
+* 44c6806 - Updated README.md with new set_up and tear_down instructions (bethesque, 29 seconds ago)
+* 3c426b7 - Added set_up/tear_down to manage base provider state.
+* 697a5be - Changed default logging level to DEBUG (bethesque, 32 minutes ago)
+* 48483b2 - Fixed JSON serialisation of matcher results with active_support loaded (bethesque, 49 minutes ago)
+* 0be5b01 - Updated description of Shokkenki (bethesque, 7 hours ago)
+
+### 1.0.34 (17 March 2014)
 
 * 6c923f4 - In the pact file, replaced $.metadata.pact_gem.version with $.metadata.pactSpecificationVersion as the gem version is irrelevant - it is the serialization format that matters, and that hasn't changed yet. Also, recording the gem version creates extra changes to be committed when the gem is upgraded, and is meaningless for pacts generated/verified by the JVM code. (Beth Skurrie, 5 minutes ago)
 
-### 1.0.33 (13 March 2013)
+### 1.0.33 (13 March 2014)
 
 * 49456cc - Added the ability to configure modules that can be used in provider state definitions (Beth Skurrie, 75
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact (1.0.34)
+    pact (1.0.35)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json

data/README.md

@@ -110,7 +110,7 @@ describe MyServiceProviderClient, :pact => true do
     # Configure your client to point to the stub service on localhost using the port you have specified
     MyServiceProviderClient.base_uri 'localhost:1234'
   end
-  
+
   subject { MyServiceProviderClient.new }
 
   describe "get_something" do
@@ -287,8 +287,36 @@ end
 require_relative 'provider_states_for_my_service_consumer.rb'
 ```
 
-If a state should be used for all consumers, the top level Pact.with_consumer can be skipped, and a global Pact.provider_state can be defined on its own.
+To define code that should run before/after each interaction, regardless of whether a provider state is specified or not:
+
+```ruby
+
+  Pact.provider_states_for 'My Service Consumer' do
+
+    set_up do
+      # eg. create API user, start database cleaner transaction
+    end
+
+    tear_down do
+      # eg. clean database
+    end
+  end
+
+```
+
+Or for global set up/tear down for all consumers:
+
+```ruby
+Pact.set_up do
+  # eg. start database cleaner transaction
+  # Avoid using the global set up for creating data as it will make your tests brittle.
+  # You don't want changes to one consumer pact to affect another one.
+end
 
+Pact.tear_down do
+  # eg. clean database
+end
+```
 
 ### Verifying pacts
 
@@ -376,7 +404,7 @@ See [Frequently Asked Questions](https://github.com/realestate-com-au/pact/blob/
 
 [Pact Broker Client](https://github.com/bethesque/pact_broker-client) - Contains rake tasks for publishing pacts to the pact_broker.
 
-[Shokkenki](https://github.com/brentsnook/shokkenki) - Another Consumer Driven Contract gem written by one of Pact's original authors, Brent Snook.
+[Shokkenki](https://github.com/brentsnook/shokkenki) - Another Consumer Driven Contract gem written by one of Pact's original authors, Brent Snook. Shokkenki allows matchers to be composed using jsonpath expressions and allows auto-generation of mock response values based on regular expressions.
 
 ## TODO
 
@@ -386,12 +414,10 @@ Short term:
 
 Long term:
 - Provide more flexible matching (eg the keys should match, and the classes of the values should match, but the values of each key do not need to be equal). This is to make the pact verification less brittle.
-- Add support for verifying pact against running server
 - Add XML support
 - Improve display of interaction diffs
 - Decouple Rspec from Pact and make rspec-pact gem for easy integration
 
-
 ## Contributing
 
 1. Fork it

data/lib/pact/configuration.rb

@@ -64,7 +64,7 @@ module Pact
   def self.default_logger path
     FileUtils::mkdir_p File.dirname(path)
     logger = Logger.new(path)
-    logger.level = Logger::INFO
+    logger.level = Logger::DEBUG
     logger
   end
 

data/lib/pact/matchers/index_not_found.rb

@@ -9,7 +9,7 @@ module Pact
     end
 
     def to_json options = {}
-      to_s
+      as_json.to_json options
     end
 
     def as_json options = {}

data/lib/pact/matchers/unexpected_index.rb

@@ -14,7 +14,7 @@ module Pact
     end
 
     def to_json opts = {}
-      to_s
+      as_json.to_json options
     end
 
   end

data/lib/pact/matchers/unexpected_key.rb

@@ -14,7 +14,7 @@ module Pact
     end
 
     def to_json opts = {}
-      to_s
+      as_json.to_json options
     end
   end
 end

data/lib/pact/provider/configuration.rb

@@ -1,6 +1,7 @@
 require 'pact/provider/pact_verification'
 require 'pact/shared/dsl'
-require 'pact/provider/provider_state_configured_modules'
+require 'pact/provider/state/provider_state'
+require 'pact/provider/state/provider_state_configured_modules'
 
 module Pact
 
@@ -13,6 +14,7 @@ module Pact
     end
 
     Pact.send(:extend, Pact::Provider::DSL)
+    Pact.send(:extend, Pact::Provider::State::DSL)
 
     module Configuration
 
@@ -46,7 +48,7 @@ module Pact
         end
 
         def include mod
-          Pact::Provider::ProviderStateConfiguredModules.instance_eval do
+          Pact::Provider::State::ProviderStateConfiguredModules.instance_eval do
             include mod
           end
         end

data/lib/pact/provider/rspec.rb

@@ -84,6 +84,7 @@ module Pact
         end
 
         def describe_response response, interaction_context
+          # TODO : Hide the interaction_context from the output line as it is confusing
           describe "returns a response which" do
             if response['status']
               it "has status code #{response['status']}" do

data/lib/pact/provider/{provider_state.rb → state/provider_state.rb}

@@ -1,14 +1,24 @@
 require 'pact/shared/dsl'
-require 'pact/provider/provider_state_configured_modules'
+require 'pact/provider/state/provider_state_configured_modules'
 
 module Pact
-  module Provider
+  module Provider::State
+
+    BASE_PROVIDER_STATE_NAME = "__base_provider_state__"
 
     module DSL
       def provider_state name, &block
         ProviderStates.provider_state(name, &block).register
       end
 
+      def set_up &block
+        ProviderStates.base_provider_state.register.register_set_up &block
+      end
+
+      def tear_down &block
+        ProviderStates.base_provider_state.register_tear_down &block
+      end
+
       def provider_states_for name, &block
         ProviderStates.current_namespaces << name
         instance_eval(&block)
@@ -21,6 +31,12 @@ module Pact
         ProviderState.build(name, current_namespaces.join('.'), &block)
       end
 
+      def self.base_provider_state
+        fullname = namespaced_name BASE_PROVIDER_STATE_NAME, {:for => current_namespaces.first }
+        provider_states[fullname] ||
+          ProviderState.new(BASE_PROVIDER_STATE_NAME, current_namespaces.join('.'))
+      end
+
       def self.register name, provider_state
         provider_states[name] = provider_state
       end
@@ -34,8 +50,17 @@ module Pact
       end
 
       def self.get name, options = {}
+        fullname = namespaced_name name, options
+        (provider_states[fullname] || provider_states[fullname.to_sym] || provider_states[name])
+      end
+
+      def self.get_base opts = {}
+        fullname = namespaced_name BASE_PROVIDER_STATE_NAME, opts
+        provider_states[fullname] || NoOpProviderState
+      end
+
+      def self.namespaced_name name, options = {}
         fullname = options[:for] ? "#{options[:for]}.#{name}" : name
-        (provider_states[fullname] || provider_states[fullname.to_sym]) || provider_states[name]
       end
     end
 
@@ -72,6 +97,7 @@ module Pact
 
       def register
         ProviderStates.register(namespaced(name), self)
+        self
       end
 
       def finalize
@@ -130,5 +156,17 @@ module Pact
         end
       end
     end
+
+    class NoOpProviderState
+
+      def self.set_up
+
+      end
+
+      def self.tear_down
+
+      end
+
+    end
   end
 end

data/lib/pact/provider/{provider_state_configured_modules.rb → state/provider_state_configured_modules.rb}

@@ -1,5 +1,5 @@
 module Pact
-  module Provider
+  module Provider::State
     module ProviderStateConfiguredModules
       # Placeholder for modules configured using config.include
     end

data/lib/pact/provider/state/provider_state_manager.rb

@@ -0,0 +1,42 @@
+module Pact
+  module Provider::State
+    class ProviderStateManager
+
+      attr_reader :provider_state_name, :consumer
+
+      def initialize provider_state_name, consumer
+        @provider_state_name = provider_state_name
+        @consumer = consumer
+      end
+
+      def set_up_provider_state
+        get_global_base_provider_state.set_up
+        get_consumer_base_provider_state.set_up
+        if provider_state_name
+          get_provider_state.set_up
+        end
+      end
+
+      def tear_down_provider_state
+        if provider_state_name
+          get_provider_state.tear_down
+        end
+        get_consumer_base_provider_state.tear_down
+        get_global_base_provider_state.tear_down
+      end
+
+      def get_provider_state
+        Pact.world.provider_states.get(provider_state_name, :for => consumer)
+      end
+
+      def get_consumer_base_provider_state
+        Pact.world.provider_states.get_base(:for => consumer)
+      end
+
+      def get_global_base_provider_state
+        Pact.world.provider_states.get_base
+      end
+
+    end
+  end
+end

data/lib/pact/provider/{provider_state_proxy.rb → state/provider_state_proxy.rb}

@@ -1,5 +1,5 @@
 module Pact
-  module Provider
+  module Provider::State
     class ProviderStateProxy
 
       attr_reader :missing_provider_states
@@ -16,6 +16,10 @@ module Pact
         provider_state
       end
 
+      def get_base options = {}
+        ProviderStates.get_base options
+      end
+
       private
 
       def error_message name, consumer

data/lib/pact/provider/test_methods.rb

@@ -1,10 +1,11 @@
 require 'pact/logging'
 require 'rack/test'
 require 'pact/consumer_contract/interaction'
-require 'pact/provider/provider_state'
-require 'pact/provider/provider_state_proxy'
+require 'pact/provider/state/provider_state'
+require 'pact/provider/state/provider_state_proxy'
 require 'pact/provider/request'
 require 'pact/provider/world'
+require 'pact/provider/state/provider_state_manager'
 
 module Pact
   module Provider
@@ -34,20 +35,13 @@ module Pact
       end
 
       def set_up_provider_state provider_state_name, consumer
-        if provider_state_name
-          get_provider_state(provider_state_name, consumer).set_up
-        end
+        State::ProviderStateManager.new(provider_state_name, consumer).set_up_provider_state
       end
 
       def tear_down_provider_state provider_state_name, consumer
-        if provider_state_name
-          get_provider_state(provider_state_name, consumer).tear_down
-        end
+        State::ProviderStateManager.new(provider_state_name, consumer).tear_down_provider_state
       end
 
-      def get_provider_state provider_state_name, consumer
-        Pact.world.provider_states.get(provider_state_name, :for => consumer)
-      end
     end
   end
 end

data/lib/pact/provider/world.rb

@@ -1,17 +1,21 @@
+require 'pact/provider/state/provider_state_proxy'
+
 module Pact
 
   def self.world
     @world ||= Pact::Provider::World.new
   end
 
+  # internal api, for testing only
+  def self.clear_world
+    @world = nil
+  end
+
   module Provider
     class World
 
-      def initialize
-      end
-
       def provider_states
-        @provider_states_proxy ||= Pact::Provider::ProviderStateProxy.new
+        @provider_states_proxy ||= Pact::Provider::State::ProviderStateProxy.new
       end
 
     end

data/lib/pact/shared/key_not_found.rb

@@ -17,7 +17,7 @@ module Pact
     end
 
     def to_json options = {}
-      to_s
+      as_json.to_json options
     end
 
     def empty?

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.0.34"
+  VERSION = "1.0.35"
 end

data/spec/lib/pact/provider/state/provider_state_manager_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+require 'pact/provider/state/provider_state_manager'
+
+module Pact::Provider::State
+
+
+  describe ProviderStateManager do
+
+    PROVIDER_STATE_MESSAGES = []
+
+    before do
+      PROVIDER_STATE_MESSAGES.clear
+      Pact.clear_world
+
+      Pact.set_up do
+        PROVIDER_STATE_MESSAGES << :global_base_set_up
+      end
+
+      Pact.tear_down do
+        PROVIDER_STATE_MESSAGES << :global_base_tear_down
+      end
+
+      Pact.provider_states_for "a consumer with provider states" do
+        set_up do
+          PROVIDER_STATE_MESSAGES << :consumer_base_set_up
+        end
+
+        tear_down do
+          PROVIDER_STATE_MESSAGES << :consumer_base_tear_down
+        end
+
+        provider_state "a custom state" do
+          set_up do
+            PROVIDER_STATE_MESSAGES << :custom_consumer_state_set_up
+          end
+
+          tear_down do
+            PROVIDER_STATE_MESSAGES << :custom_consumer_state_tear_down
+          end
+        end
+
+      end
+    end
+
+    let(:provider_state_manager) { ProviderStateManager.new("a custom state", "a consumer with provider states") }
+
+    describe "set_up_provider_state" do
+
+      subject { provider_state_manager.set_up_provider_state }
+
+      it "sets up the global base state" do
+        subject
+        expect(PROVIDER_STATE_MESSAGES[0]).to eq :global_base_set_up
+      end
+
+      it "sets up the consumer base state" do
+        subject
+        expect(PROVIDER_STATE_MESSAGES[1]).to eq :consumer_base_set_up
+      end
+
+      it "sets up the consumer custom state" do
+        subject
+        expect(PROVIDER_STATE_MESSAGES[2]).to eq :custom_consumer_state_set_up
+      end
+    end
+
+    describe "tear_down_provider_state" do
+
+      subject { provider_state_manager.tear_down_provider_state }
+
+      it "tears down the consumer custom state" do
+        subject
+        expect(PROVIDER_STATE_MESSAGES[0]).to eq :custom_consumer_state_tear_down
+      end
+
+      it "tears down the consumer base state" do
+        subject
+        expect(PROVIDER_STATE_MESSAGES[1]).to eq :consumer_base_tear_down
+      end
+
+      it "tears down the global base state" do
+        subject
+        expect(PROVIDER_STATE_MESSAGES[2]).to eq :global_base_tear_down
+      end
+    end
+
+  end
+
+end

data/spec/lib/pact/provider/{provider_state_proxy_spec.rb → state/provider_state_proxy_spec.rb}

@@ -1,22 +1,24 @@
 require 'spec_helper'
-require 'pact/provider/provider_state_proxy'
+require 'pact/provider/state/provider_state_proxy'
 
 module Pact
-  module Provider
+  module Provider::State
     describe ProviderStateProxy do
 
       let(:provider_state_proxy) { ProviderStateProxy.new }
 
+      let(:options) { { :for => 'some consumer'} }
+      let(:provider_state) { double("provider_state")}
+
       describe "get" do
         let(:name) { "some state" }
-        let(:options) { { :for => 'some consumer'} }
-        let(:provider_state) { double("provider_state")}
 
         subject { provider_state_proxy.get name, options }
 
         before do
           ProviderStates.stub(:get).and_return(provider_state)
         end
+
         context "when the provider state exists" do
 
           it "retrieves the provider state from ProviderState" do
@@ -55,6 +57,24 @@ module Pact
 
 
       end
+
+      describe "get_base" do
+
+        before do
+          ProviderStates.stub(:get_base).and_return(provider_state)
+        end
+
+        subject { provider_state_proxy.get_base options }
+
+        it "calls through to ProviderStates" do
+          ProviderStates.should_receive(:get_base).with(options)
+          subject
+        end
+
+        it "returns the state" do
+          expect(subject).to eq provider_state
+        end
+      end
     end
   end
 end

data/spec/lib/pact/provider/state/provider_state_spec.rb

@@ -0,0 +1,213 @@
+require 'spec_helper'
+require 'pact/provider/state/provider_state'
+
+module Pact
+  module Provider::State
+
+    describe ProviderStates do
+      MESSAGES = []
+
+      before do
+        MESSAGES.clear
+      end
+
+      describe 'global ProviderState' do
+
+
+        Pact.provider_state :no_alligators do
+          set_up do
+            MESSAGES << 'set_up'
+          end
+          tear_down do
+            MESSAGES << 'tear_down'
+          end
+        end
+
+        Pact.provider_state 'some alligators' do
+          no_op
+        end
+
+
+        subject { ProviderStates.get('no_alligators') }
+
+        describe 'set_up' do
+          it 'should call the block passed to set_up' do
+            subject.set_up
+            MESSAGES.should eq ['set_up']
+          end
+        end
+
+        describe 'tear_down' do
+          it 'should call the block passed to set_up' do
+            subject.tear_down
+            MESSAGES.should eq ['tear_down']
+          end
+        end
+
+        describe '.get' do
+          context 'when the name is a matching symbol' do
+            it 'will return the ProviderState' do
+              ProviderStates.get('no_alligators').should_not be_nil
+            end
+          end
+          context 'when the name is a matching string' do
+            it 'will return the ProviderState' do
+              ProviderStates.get('some alligators').should_not be_nil
+            end
+          end
+        end
+      end
+
+      describe 'no_op' do
+        context "when a no_op is defined instead of a set_up or tear_down" do
+          it "treats set_up and tear_down as empty blocks" do
+            Pact.provider_state 'with_no_op' do
+              no_op
+            end
+            ProviderStates.get('with_no_op').set_up
+            ProviderStates.get('with_no_op').tear_down
+          end
+        end
+        context "when a no_op is defined with a set_up" do
+          it "raises an error" do
+            expect do
+              Pact.provider_state 'with_no_op_and_set_up' do
+                no_op
+                set_up do
+
+                end
+              end.to raise_error(/Provider state \"with_no_op_and_set_up\" has been defined as a no_op but it also has a set_up block. Please remove one or the other./)
+            end
+          end
+        end
+        context "when a no_op is defined with a tear_down" do
+          it "raises an error" do
+            expect do
+              Pact.provider_state 'with_no_op_and_set_up' do
+                no_op
+                tear_down do
+
+                end
+              end.to raise_error(/Provider state \"with_no_op_and_set_up\" has been defined as a no_op but it also has a tear_down block. Please remove one or the other./)
+            end
+          end
+        end
+
+      end
+
+
+      describe 'namespaced ProviderStates' do
+
+        NAMESPACED_MESSAGES = []
+
+        Pact.provider_states_for 'a consumer' do
+          provider_state 'the weather is sunny' do
+            set_up do
+              NAMESPACED_MESSAGES << 'sunny!'
+            end
+          end
+        end
+
+        Pact.provider_state 'the weather is cloudy' do
+          set_up do
+            NAMESPACED_MESSAGES << 'cloudy :('
+          end
+        end
+
+        before do
+          NAMESPACED_MESSAGES.clear
+        end
+
+        describe '.get' do
+          context 'for a consumer' do
+            it 'has a namespaced name' do
+              ProviderStates.get('the weather is sunny', :for => 'a consumer').should_not be_nil
+            end
+
+            it 'falls back to a global state of the same name if one is not found for the specified consumer' do
+              ProviderStates.get('the weather is cloudy', :for => 'a consumer').should_not be_nil
+            end
+          end
+
+        end
+
+        describe 'set_up' do
+          context 'for a consumer' do
+            it 'runs its own setup' do
+              ProviderStates.get('the weather is sunny', :for => 'a consumer').set_up
+              NAMESPACED_MESSAGES.should eq ['sunny!']
+            end
+          end
+        end
+      end
+
+      describe "base_provider_state" do
+        Pact.provider_states_for "a consumer with base state" do
+          set_up do
+            MESSAGES << "setting up base provider state"
+          end
+        end
+
+        context "when the base state has been declared" do
+          it "creates a base state for the provider" do
+            ProviderStates.get_base(:for => "a consumer with base state").set_up
+            expect(MESSAGES).to eq ["setting up base provider state"]
+          end
+
+        end
+
+        context "when a base state has not been declared" do
+          it "returns a no op state" do
+            ProviderStates.get_base(:for => "a consumer that does not exist").set_up
+            ProviderStates.get_base(:for => "a consumer that does not exist").tear_down
+          end
+        end
+
+      end
+
+      describe "global base_provider_state" do
+
+        before(:all) do
+          Pact.set_up do
+            MESSAGES << "setting up global base provider state"
+          end
+        end
+
+        context "when the base state has been declared" do
+          it "creates a base state for the provider" do
+            ProviderStates.get_base.set_up
+            expect(MESSAGES).to eq ["setting up global base provider state"]
+          end
+
+        end
+
+        context "when a base state has not been declared" do
+          it "returns a no op state" do
+            ProviderStates.get_base.set_up
+            ProviderStates.get_base.tear_down
+          end
+        end
+      end
+
+      describe "invalid provider state" do
+        context "when no set_up or tear_down is provided" do
+          it "raises an error to prevent someone forgetting about the set_up and putting the set_up code directly in the provider_state block and wasting 20 minutes trying to work out why their provider states aren't working properly" do
+            expect do
+              Pact.provider_state 'invalid' do
+              end
+            end.to raise_error(/Please provide a set_up or tear_down block for provider state \"invalid\"/)
+          end
+        end
+        context "when a no_op is defined" do
+          it "does not raise an error" do
+            expect do
+              Pact.provider_state 'valid' do
+                no_op
+              end
+            end.not_to raise_error
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact/provider/world_spec.rb

@@ -11,6 +11,14 @@ describe Pact do
     end
   end
 
+  describe ".clear_world" do
+    it "clears the world" do
+      original_world = Pact.world
+      Pact.clear_world
+      expect(original_world).to_not be Pact.world
+    end
+  end
+
 end
 
 module Pact
@@ -20,7 +28,7 @@ module Pact
       subject { World.new }
       describe "provider_states" do
         it "returns a provider state proxy" do
-          expect(subject.provider_states).to be_instance_of ProviderStateProxy
+          expect(subject.provider_states).to be_instance_of State::ProviderStateProxy
         end
         it "returns the same object each time" do
           expect(subject.provider_states).to be subject.provider_states

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.0.34
+  version: 1.0.35
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -357,11 +357,12 @@ files:
 - lib/pact/provider/pact_spec_runner.rb
 - lib/pact/provider/pact_verification.rb
 - lib/pact/provider/print_missing_provider_states.rb
-- lib/pact/provider/provider_state.rb
-- lib/pact/provider/provider_state_configured_modules.rb
-- lib/pact/provider/provider_state_proxy.rb
 - lib/pact/provider/request.rb
 - lib/pact/provider/rspec.rb
+- lib/pact/provider/state/provider_state.rb
+- lib/pact/provider/state/provider_state_configured_modules.rb
+- lib/pact/provider/state/provider_state_manager.rb
+- lib/pact/provider/state/provider_state_proxy.rb
 - lib/pact/provider/test_methods.rb
 - lib/pact/provider/verification_report.rb
 - lib/pact/provider/world.rb
@@ -411,10 +412,11 @@ files:
 - spec/lib/pact/provider/pact_helper_locator_spec.rb
 - spec/lib/pact/provider/pact_spec_runner_spec.rb
 - spec/lib/pact/provider/print_missing_provider_states_spec.rb
-- spec/lib/pact/provider/provider_state_proxy_spec.rb
-- spec/lib/pact/provider/provider_state_spec.rb
 - spec/lib/pact/provider/request_spec.rb
 - spec/lib/pact/provider/rspec_spec.rb
+- spec/lib/pact/provider/state/provider_state_manager_spec.rb
+- spec/lib/pact/provider/state/provider_state_proxy_spec.rb
+- spec/lib/pact/provider/state/provider_state_spec.rb
 - spec/lib/pact/provider/world_spec.rb
 - spec/lib/pact/reification_spec.rb
 - spec/lib/pact/shared/dsl_spec.rb
@@ -451,12 +453,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 548296881377135136
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 548296881377135136
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -496,10 +504,11 @@ test_files:
 - spec/lib/pact/provider/pact_helper_locator_spec.rb
 - spec/lib/pact/provider/pact_spec_runner_spec.rb
 - spec/lib/pact/provider/print_missing_provider_states_spec.rb
-- spec/lib/pact/provider/provider_state_proxy_spec.rb
-- spec/lib/pact/provider/provider_state_spec.rb
 - spec/lib/pact/provider/request_spec.rb
 - spec/lib/pact/provider/rspec_spec.rb
+- spec/lib/pact/provider/state/provider_state_manager_spec.rb
+- spec/lib/pact/provider/state/provider_state_proxy_spec.rb
+- spec/lib/pact/provider/state/provider_state_spec.rb
 - spec/lib/pact/provider/world_spec.rb
 - spec/lib/pact/reification_spec.rb
 - spec/lib/pact/shared/dsl_spec.rb

data/spec/lib/pact/provider/provider_state_spec.rb

@@ -1,161 +0,0 @@
-require 'spec_helper'
-require 'pact/provider/provider_state'
-
-module Pact
-  module Provider
-
-    describe 'global ProviderState' do
-
-      MESSAGES = []
-
-      Pact.provider_state :no_alligators do
-        set_up do
-          MESSAGES << 'set_up'
-        end
-        tear_down do
-          MESSAGES << 'tear_down'
-        end
-      end
-
-      Pact.provider_state 'some alligators' do
-        no_op
-      end
-
-      before do
-        MESSAGES.clear
-      end
-
-      subject { ProviderStates.get('no_alligators') }
-
-      describe 'set_up' do
-        it 'should call the block passed to set_up' do
-          subject.set_up
-          MESSAGES.should eq ['set_up']
-        end
-      end
-
-      describe 'tear_down' do
-        it 'should call the block passed to set_up' do
-          subject.tear_down
-          MESSAGES.should eq ['tear_down']
-        end
-      end
-
-      describe '.get' do
-        context 'when the name is a matching symbol' do
-          it 'will return the ProviderState' do
-            ProviderStates.get('no_alligators').should_not be_nil
-          end
-        end
-        context 'when the name is a matching string' do
-          it 'will return the ProviderState' do
-            ProviderStates.get('some alligators').should_not be_nil
-          end
-        end
-      end
-    end
-
-    describe 'no_op' do
-      context "when a no_op is defined instead of a set_up or tear_down" do
-        it "treats set_up and tear_down as empty blocks" do
-          Pact.provider_state 'with_no_op' do
-            no_op
-          end
-          ProviderStates.get('with_no_op').set_up
-          ProviderStates.get('with_no_op').tear_down
-        end
-      end
-      context "when a no_op is defined with a set_up" do
-        it "raises an error" do
-          expect do
-            Pact.provider_state 'with_no_op_and_set_up' do
-              no_op
-              set_up do
-
-              end
-            end.to raise_error(/Provider state \"with_no_op_and_set_up\" has been defined as a no_op but it also has a set_up block. Please remove one or the other./)
-          end
-        end
-      end
-      context "when a no_op is defined with a tear_down" do
-        it "raises an error" do
-          expect do
-            Pact.provider_state 'with_no_op_and_set_up' do
-              no_op
-              tear_down do
-
-              end
-            end.to raise_error(/Provider state \"with_no_op_and_set_up\" has been defined as a no_op but it also has a tear_down block. Please remove one or the other./)
-          end
-        end
-      end
-
-    end
-
-
-    describe 'namespaced ProviderStates' do
-
-      NAMESPACED_MESSAGES = []
-
-      Pact.provider_states_for 'a consumer' do
-        provider_state 'the weather is sunny' do
-          set_up do
-            NAMESPACED_MESSAGES << 'sunny!'
-          end
-        end
-      end
-
-      Pact.provider_state 'the weather is cloudy' do
-        set_up do
-          NAMESPACED_MESSAGES << 'cloudy :('
-        end
-      end
-
-      before do
-        NAMESPACED_MESSAGES.clear
-      end
-
-      describe '.get' do
-        context 'for a consumer' do
-          it 'has a namespaced name' do
-            ProviderStates.get('the weather is sunny', :for => 'a consumer').should_not be_nil
-          end
-
-          it 'falls back to a global state of the same name if one is not found for the specified consumer' do
-            ProviderStates.get('the weather is cloudy', :for => 'a consumer').should_not be_nil
-          end
-        end
-
-      end
-
-      describe 'set_up' do
-        context 'for a consumer' do
-          it 'runs its own setup' do
-            ProviderStates.get('the weather is sunny', :for => 'a consumer').set_up
-            NAMESPACED_MESSAGES.should eq ['sunny!']
-          end
-        end
-      end
-    end
-
-    describe "invalid provider state" do
-      context "when no set_up or tear_down is provided" do
-        it "raises an error to prevent someone forgetting about the set_up and putting the set_up code directly in the provider_state block and wasting 20 minutes trying to work out why their provider states aren't working properly" do
-          expect do
-            Pact.provider_state 'invalid' do
-            end
-          end.to raise_error(/Please provide a set_up or tear_down block for provider state \"invalid\"/)
-        end
-      end
-      context "when a no_op is defined" do
-        it "does not raise an error" do
-          expect do
-            Pact.provider_state 'valid' do
-              no_op
-            end
-          end.not_to raise_error
-        end
-      end
-    end
-  end
-end