pact 0.1.37 → 1.0.0

data/spec/lib/pact/{producer/configuration_dsl_spec.rb → provider/dsl_spec.rb}

@@ -1,95 +1,96 @@
 require 'spec_helper'
-require 'pact/producer/configuration_dsl'
+require 'pact/provider/dsl'
 
-module Pact::Producer
-  describe ConfigurationDSL do
+module Pact::Provider
+  describe DSL do
 
     class MockConfig
-      include ConfigurationDSL
+      include Pact::Provider::DSL
     end
 
-    describe "producer" do
+    describe "service_provider" do
+
+      before do
+        Pact.clear_configuration
+      end
+
       let(:mock_config) { MockConfig.new }
-      context "when a producer is configured" do
+      context "when a provider is configured" do
         before do
-          mock_config.producer do
-            name "Fred"
+          mock_config.service_provider "Fred" do
             app { "An app" }
           end
         end
         it "should allow configuration of the name" do
-          expect(mock_config.producer.name).to eql "Fred"
+          expect(Pact.configuration.provider.name).to eql "Fred"
         end
         it "should allow configuration of the test app" do
-          expect(mock_config.producer.app).to eql "An app"
+          expect(Pact.configuration.provider.app).to eql "An app"
         end
       end
-      context "when a producer is not configured" do
+      #Move this test to configuration
+      context "when a provider is not configured" do
         it "raises an error" do
-          expect{ mock_config.producer }.to raise_error(/Please configure your producer/)
+          expect{ Pact.configuration.provider }.to raise_error(/Please configure your provider/)
         end
       end
     end
 
 
-    module ConfigurationDSL
+    module DSL
 
-      describe ProducerDSL do
+      describe ServiceProviderDSL do
 
         describe "initialize" do
 
           context "with an object instead of a block" do
             subject do
-              ProducerDSL.new do
-                name nil
+              ServiceProviderDSL.new 'name' do
                 app 'blah'
               end
             end
             it "raises an error" do
-              expect{ subject }.to raise_error
+              expect{ subject }.to raise_error /wrong number of arguments/
             end
           end
 
-
         end
         describe "validate" do
           context "when no name is provided" do
             subject do
-              ProducerDSL.new do
+              ServiceProviderDSL.new ' ' do
                 app { Object.new }
               end
             end
             it "raises an error" do
-              expect{ subject.validate}.to raise_error("Please provide a name for the Producer")
+              expect{ subject.validate}.to raise_error("Please provide a name for the Provider")
             end
           end
           context "when nil name is provided" do
             subject do
-              ProducerDSL.new do
-                name nil
+              ServiceProviderDSL.new nil do
                 app { Object.new }
               end
             end
             it "raises an error" do
-              expect{ subject.validate}.to raise_error("Please provide a name for the Producer")
+              expect{ subject.validate}.to raise_error("Please provide a name for the Provider")
             end
           end
           context "when no app is provided" do
             subject do
-              ProducerDSL.new do
-                name 'Blah'
+              ServiceProviderDSL.new 'Blah' do
               end
             end
             it "raises an error" do
-              expect{ subject.validate }.to raise_error("Please configure an app for the Producer")
+              expect{ subject.validate }.to raise_error("Please configure an app for the Provider")
             end
           end
         end
       end
 
-      describe ProducerConfig do
+      describe ServiceProviderConfig do
         describe "app" do
-          subject { ProducerConfig.new("blah") { Object.new } }
+          subject { ServiceProviderConfig.new("blah") { Object.new } }
           it "should execute the app_block each time" do
             expect(subject.app.object_id).to_not equal(subject.app.object_id)
           end

data/spec/lib/pact/{producer/producer_state_spec.rb → provider/provider_state_spec.rb}

@@ -1,14 +1,14 @@
 require 'spec_helper'
-require 'pact/producer/producer_state'
+require 'pact/provider/provider_state'
 
 module Pact
-  module Producer
+  module Provider
 
-    describe 'global ProducerState' do
+    describe 'global ProviderState' do
 
       MESSAGES = []
 
-      Pact.producer_state :no_alligators do
+      Pact.provider_state :no_alligators do
         set_up do
           MESSAGES << 'set_up'
         end
@@ -17,14 +17,14 @@ module Pact
         end
       end
 
-      Pact.producer_state 'some alligators' do
+      Pact.provider_state 'some alligators' do
       end
 
       before do
         MESSAGES.clear
       end
 
-      subject { ProducerState.get('no_alligators') }
+      subject { ProviderState.get('no_alligators') }
 
       describe 'set_up' do
         it 'should call the block passed to set_up' do
@@ -42,32 +42,32 @@ module Pact
 
       describe '.get' do
         context 'when the name is a matching symbol' do
-          it 'will return the ProducerState' do
-            ProducerState.get('no_alligators').should_not be_nil
+          it 'will return the ProviderState' do
+            ProviderState.get('no_alligators').should_not be_nil
           end
         end
         context 'when the name is a matching string' do
-          it 'will return the ProducerState' do
-            ProducerState.get('some alligators').should_not be_nil
+          it 'will return the ProviderState' do
+            ProviderState.get('some alligators').should_not be_nil
           end
         end
       end
     end
 
 
-    describe 'namespaced ProducerStates' do
+    describe 'namespaced ProviderStates' do
 
       NAMESPACED_MESSAGES = []
 
-      Pact.with_consumer 'a consumer' do
-        producer_state 'the weather is sunny' do
+      Pact.provider_states_for 'a consumer' do
+        provider_state 'the weather is sunny' do
           set_up do
             NAMESPACED_MESSAGES << 'sunny!'
           end
         end
       end
 
-      Pact.producer_state 'the weather is cloudy' do
+      Pact.provider_state 'the weather is cloudy' do
         set_up do
           NAMESPACED_MESSAGES << 'cloudy :('
         end
@@ -80,11 +80,11 @@ module Pact
       describe '.get' do
         context 'for a consumer' do
           it 'has a namespaced name' do
-            ProducerState.get('the weather is sunny', :for => 'a consumer').should_not be_nil
+            ProviderState.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
-            ProducerState.get('the weather is cloudy', :for => 'a consumer').should_not be_nil
+            ProviderState.get('the weather is cloudy', :for => 'a consumer').should_not be_nil
           end
         end
 
@@ -93,7 +93,7 @@ module Pact
       describe 'set_up' do
         context 'for a consumer' do
           it 'runs its own setup' do
-            ProducerState.get('the weather is sunny', :for => 'a consumer').set_up
+            ProviderState.get('the weather is sunny', :for => 'a consumer').set_up
             NAMESPACED_MESSAGES.should eq ['sunny!']
           end
         end

data/spec/lib/pact/{producer → provider}/rspec_spec.rb

@@ -31,7 +31,7 @@ describe "the match_term matcher" do
   end
 
   # Note: because a consumer specifies only the keys it cares about, the pact ignores keys that are returned
-  # by the producer, but not are not specified in the pact. This means that any hash will match an
+  # by the provider, but not are not specified in the pact. This means that any hash will match an
   # expected empty hash, because there is currently no way for a consumer to expect an absence of keys.
   it 'is confused by an empty hash' do
     expect({:hello => 'everyone'}).to match_term({})

data/spec/lib/pact/verification_task_spec.rb

@@ -27,14 +27,14 @@ module Pact
 			let(:consumer_contract) { [ uri: @pact_uri, support_file: @support_file, consumer: @consumer] }
 
 			it 'verifies the pacts using PactSpecRunner' do
-				Producer::PactSpecRunner.should_receive(:run).with(consumer_contract).and_return(0)
+				Provider::PactSpecRunner.should_receive(:run).with(consumer_contract).and_return(0)
 				Rake::Task[@task_name].execute
 			end
 
 			context 'when all specs pass' do
 
 				before do
-					Producer::PactSpecRunner.stub(:run).and_return(0)
+					Provider::PactSpecRunner.stub(:run).and_return(0)
 				end
 
 				it 'does not raise an exception' do
@@ -45,7 +45,7 @@ module Pact
 			context 'when one or more specs fail' do
 
 				before do
-					Producer::PactSpecRunner.stub(:run).and_return(1)
+					Provider::PactSpecRunner.stub(:run).and_return(1)
 				end
 
 				it 'raises an exception' do

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rspec'
 require 'pact'
 require 'webmock/rspec'
+require_relative 'support/factories'
 
 WebMock.disable_net_connect!(allow_localhost: true)

data/spec/support/a_consumer-a_producer.json

@@ -1,6 +1,6 @@
 {
   "producer": {
-    "name": "a producer"
+    "name": "an old producer"
   },
   "consumer": {
     "name": "a consumer"

data/spec/support/a_consumer-a_provider.json

@@ -0,0 +1,34 @@
+{
+  "provider": {
+    "name": "a provider"
+  },
+  "consumer": {
+    "name": "a consumer"
+  },
+  "interactions": [
+    {
+      "description": "request one",
+      "request": {
+        "method": "get",
+        "path": "/path_one"
+      },
+      "response": {
+      },
+      "provider_state": "state one"
+    },
+    {
+      "description": "request two",
+      "request": {
+        "method": "get",
+        "path": "/path_two"
+      },
+      "response": {
+      }
+    }
+  ],
+  "metadata": {
+    "pact_gem": {
+      "version": "0.1.24"
+    }
+  }
+}

data/spec/support/consumer_contract_template.json

@@ -0,0 +1,26 @@
+{
+  "provider": {
+    "name": "a provider"
+  },
+  "consumer": {
+    "name": "a consumer"
+  },
+  "interactions": [
+    {
+      "description": "request one",
+      "request": {
+        "method": "get",
+        "path": "/path_one"
+      },
+      "response": {
+        "status" : 200
+      },
+      "provider_state": "state one"
+    }
+  ],
+  "metadata": {
+    "pact_gem": {
+      "version": "0.1.24"
+    }
+  }
+}

data/spec/support/factories.rb

@@ -0,0 +1,78 @@
+require 'hashie'
+require 'hashie/extensions/key_conversion'
+
+module Pact
+  module HashUtils
+
+    class Converter < Hash
+      include Hashie::Extensions::KeyConversion
+      include Hashie::Extensions::DeepMerge
+    end
+
+    def symbolize_keys hash
+      Hash[Converter[hash].symbolize_keys]
+    end
+
+    def stringify_keys hash
+      Hash[Converter[hash].stringify_keys]
+    end
+
+    def deep_merge hash1, hash2
+      Converter[hash1].deep_merge(Converter[hash2])
+    end
+  end
+end
+
+class InteractionFactory
+
+  extend Pact::HashUtils
+
+  DEFAULTS = Hash[
+    'request' => {
+      'path' => '/path',
+      'method' => 'get',
+    },
+    'response' => {
+      'body' => {a: 'response body'}
+    },
+    'description' => 'a description',
+    'provider_state' => 'a thing exists'
+  ]
+
+  def self.create hash = {}
+    Pact::Interaction.from_hash(stringify_keys(deep_merge(DEFAULTS, stringify_keys(hash))))
+  end
+end
+
+
+class ConsumerContractFactory
+  extend Pact::HashUtils
+  DEFAULTS = {:consumer_name => 'consumer',
+      :provider_name => 'provider',
+      :interactions => [InteractionFactory.create]}
+
+  def self.create overrides = {}
+    options = deep_merge(symbolize_keys(DEFAULTS), symbolize_keys(overrides))
+    Pact::ConsumerContract.new({:consumer => Pact::ServiceConsumer.new(name: options[:consumer_name]),
+      :provider => Pact::ServiceProvider.new(name: options[:provider_name]),
+      :interactions => options[:interactions]})
+  end
+end
+
+
+
+class ResponseFactory
+  extend Pact::HashUtils
+  DEFAULTS = {:status => 200, :body => {a: 'body'}}.freeze
+  def self.create_hash overrides = {}
+    deep_merge(DEFAULTS, overrides)
+  end
+end
+
+class RequestFactory
+  extend Pact::HashUtils
+  DEFAULTS = {:path => '/path', :method => 'get'}.freeze
+  def self.create_hash overrides = {}
+   deep_merge(DEFAULTS, overrides)
+  end
+end

data/spec/support/pact_rake_support.rb

@@ -12,7 +12,7 @@ module Pact
 			end
 		end
 
-		Pact.service_provider "Some Producer" do
+		Pact.service_provider "Some Provider" do
 			app { TestApp.new }
 		end
 

data/spec/support/test_app_fail.json

@@ -16,7 +16,7 @@
                 "body": {"message" : "this is not the weather you are looking for"}
 
             },
-            "producer_state": "the weather is cloudy"
+            "provider_state": "the weather is cloudy"
         }
     ]
 }

data/spec/support/test_app_pass.json

@@ -15,7 +15,7 @@
                 "headers" : {"Content-type": "application/json"},
                 "body": {"message" : "sunny"}
             },
-            "producer_state": "the weather is sunny"
+            "provider_state": "the weather is sunny"
         }
     ]
 }

data/tasks/pact-test.rake

@@ -1,4 +1,4 @@
-require './lib/pact/producer/pact_spec_runner'
+require './lib/pact/provider/pact_spec_runner'
 
 namespace :pact do
 
@@ -7,10 +7,10 @@ namespace :pact do
 		puts "Running task pact:tests"
 		# Run these specs silently, otherwise expected failures will be written to stdout and look like unexpected failures.
 
-		result = Pact::Producer::PactSpecRunner.run([{ uri: './spec/support/test_app_pass.json', support_file: './spec/support/pact_rake_support.rb', consumer: 'some-test-consumer' }], silent: true)
+		result = Pact::Provider::PactSpecRunner.run([{ uri: './spec/support/test_app_pass.json', support_file: './spec/support/pact_rake_support.rb', consumer: 'some-test-consumer' }], silent: true)
 		fail 'Expected pact to pass' unless (result == 0)
 
-		result = Pact::Producer::PactSpecRunner.run([{ uri: './spec/support/test_app_fail.json', support_file: './spec/support/pact_rake_support.rb' }], silent: true)
+		result = Pact::Provider::PactSpecRunner.run([{ uri: './spec/support/test_app_fail.json', support_file: './spec/support/pact_rake_support.rb' }], silent: true)
 		fail 'Expected pact to fail' if (result == 0)
 
 		puts "Task pact:tests completed succesfully."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -38,7 +38,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -111,22 +111,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -272,32 +256,31 @@ files:
 - lib/pact/configuration.rb
 - lib/pact/consumer.rb
 - lib/pact/consumer/app_manager.rb
-- lib/pact/consumer/configuration_dsl.rb
 - lib/pact/consumer/consumer_contract_builder.rb
 - lib/pact/consumer/consumer_contract_builders.rb
 - lib/pact/consumer/dsl.rb
-- lib/pact/consumer/interaction.rb
+- lib/pact/consumer/interaction_builder.rb
+- lib/pact/consumer/interactions_filter.rb
 - lib/pact/consumer/mock_service.rb
 - lib/pact/consumer/mock_service_client.rb
 - lib/pact/consumer/rspec.rb
-- lib/pact/consumer/run_condor.rb
-- lib/pact/consumer/run_mock_contract_service.rb
-- lib/pact/consumer/service_consumer.rb
-- lib/pact/consumer/service_producer.rb
+- lib/pact/consumer/server.rb
 - lib/pact/consumer_contract.rb
+- lib/pact/consumer_contract/consumer_contract.rb
+- lib/pact/consumer_contract/interaction.rb
+- lib/pact/consumer_contract/service_consumer.rb
+- lib/pact/consumer_contract/service_provider.rb
 - lib/pact/json_warning.rb
 - lib/pact/logging.rb
 - lib/pact/matchers.rb
 - lib/pact/matchers/matchers.rb
-- lib/pact/producer.rb
-- lib/pact/producer/configuration_dsl.rb
-- lib/pact/producer/dsl.rb
-- lib/pact/producer/matchers.rb
-- lib/pact/producer/pact_spec_runner.rb
-- lib/pact/producer/producer_state.rb
-- lib/pact/producer/rspec.rb
-- lib/pact/producer/test_methods.rb
+- lib/pact/provider.rb
+- lib/pact/provider/dsl.rb
+- lib/pact/provider/matchers.rb
+- lib/pact/provider/pact_spec_runner.rb
+- lib/pact/provider/provider_state.rb
 - lib/pact/provider/rspec.rb
+- lib/pact/provider/test_methods.rb
 - lib/pact/rake_task.rb
 - lib/pact/reification.rb
 - lib/pact/request.rb
@@ -308,28 +291,33 @@ files:
 - pact.gemspec
 - scratchpad.txt
 - spec/features/consumption_spec.rb
-- spec/features/producer_states/zebras.rb
 - spec/features/production_spec.rb
+- spec/features/provider_states/zebras.rb
 - spec/integration/pact/consumer_configuration_spec.rb
 - spec/integration/pact/provider_configuration_spec.rb
 - spec/lib/pact/configuration_spec.rb
 - spec/lib/pact/consumer/app_manager_spec.rb
 - spec/lib/pact/consumer/consumer_contract_builder_spec.rb
 - spec/lib/pact/consumer/dsl_spec.rb
-- spec/lib/pact/consumer/interaction_spec.rb
+- spec/lib/pact/consumer/interaction_builder_spec.rb
+- spec/lib/pact/consumer/interactions_spec.rb
 - spec/lib/pact/consumer/mock_service_spec.rb
 - spec/lib/pact/consumer/service_consumer_spec.rb
-- spec/lib/pact/consumer_contract_spec.rb
+- spec/lib/pact/consumer_contract/consumer_contract_spec.rb
+- spec/lib/pact/consumer_contract/interaction_spec.rb
 - spec/lib/pact/matchers/matchers_spec.rb
-- spec/lib/pact/producer/configuration_dsl_spec.rb
-- spec/lib/pact/producer/producer_state_spec.rb
-- spec/lib/pact/producer/rspec_spec.rb
+- spec/lib/pact/provider/dsl_spec.rb
+- spec/lib/pact/provider/provider_state_spec.rb
+- spec/lib/pact/provider/rspec_spec.rb
 - spec/lib/pact/reification_spec.rb
 - spec/lib/pact/request_spec.rb
 - spec/lib/pact/term_spec.rb
 - spec/lib/pact/verification_task_spec.rb
 - spec/spec_helper.rb
 - spec/support/a_consumer-a_producer.json
+- spec/support/a_consumer-a_provider.json
+- spec/support/consumer_contract_template.json
+- spec/support/factories.rb
 - spec/support/pact_rake_support.rb
 - spec/support/test_app_fail.json
 - spec/support/test_app_pass.json
@@ -361,28 +349,33 @@ specification_version: 3
 summary: Define a pact between service consumers and providers
 test_files:
 - spec/features/consumption_spec.rb
-- spec/features/producer_states/zebras.rb
 - spec/features/production_spec.rb
+- spec/features/provider_states/zebras.rb
 - spec/integration/pact/consumer_configuration_spec.rb
 - spec/integration/pact/provider_configuration_spec.rb
 - spec/lib/pact/configuration_spec.rb
 - spec/lib/pact/consumer/app_manager_spec.rb
 - spec/lib/pact/consumer/consumer_contract_builder_spec.rb
 - spec/lib/pact/consumer/dsl_spec.rb
-- spec/lib/pact/consumer/interaction_spec.rb
+- spec/lib/pact/consumer/interaction_builder_spec.rb
+- spec/lib/pact/consumer/interactions_spec.rb
 - spec/lib/pact/consumer/mock_service_spec.rb
 - spec/lib/pact/consumer/service_consumer_spec.rb
-- spec/lib/pact/consumer_contract_spec.rb
+- spec/lib/pact/consumer_contract/consumer_contract_spec.rb
+- spec/lib/pact/consumer_contract/interaction_spec.rb
 - spec/lib/pact/matchers/matchers_spec.rb
-- spec/lib/pact/producer/configuration_dsl_spec.rb
-- spec/lib/pact/producer/producer_state_spec.rb
-- spec/lib/pact/producer/rspec_spec.rb
+- spec/lib/pact/provider/dsl_spec.rb
+- spec/lib/pact/provider/provider_state_spec.rb
+- spec/lib/pact/provider/rspec_spec.rb
 - spec/lib/pact/reification_spec.rb
 - spec/lib/pact/request_spec.rb
 - spec/lib/pact/term_spec.rb
 - spec/lib/pact/verification_task_spec.rb
 - spec/spec_helper.rb
 - spec/support/a_consumer-a_producer.json
+- spec/support/a_consumer-a_provider.json
+- spec/support/consumer_contract_template.json
+- spec/support/factories.rb
 - spec/support/pact_rake_support.rb
 - spec/support/test_app_fail.json
 - spec/support/test_app_pass.json