pact 1.1.0 → 1.1.1

data/spec/spec_helper.rb

@@ -6,15 +6,11 @@ require 'pact'
 require 'webmock/rspec'
 require_relative 'support/factories'
 require_relative 'support/spec_support'
+require 'pact/provider/rspec'
 
 WebMock.disable_net_connect!(allow_localhost: true)
 
-if ENV['LOAD_ACTIVE_SUPPORT']
-   puts 'LOADING ACTIVE SUPPORT!!!! Hopefully it all still works'
-   require 'active_support/all'
-   require 'active_support'
-   require 'active_support/json'
-end
+require './spec/support/active_support_if_configured'
 
 RSpec.configure do | config |
   config.include(FakeFS::SpecHelpers, :fakefs => true)

data/spec/standalone/consumer_fail_test.rb

@@ -1,4 +1,5 @@
 require 'pact/consumer/rspec'
+require './spec/support/active_support_if_configured'
 
 Pact.service_consumer "Standalone Consumer" do
   has_pact_with "Standalone Provider" do

data/spec/standalone/consumer_pass_test.rb

@@ -1,4 +1,5 @@
 require 'pact/consumer/rspec'
+require './spec/support/active_support_if_configured'
 
 Pact.service_consumer "Standalone Consumer" do
   has_pact_with "Standalone Provider" do

data/spec/support/active_support_if_configured.rb

@@ -0,0 +1,6 @@
+if ENV['LOAD_ACTIVE_SUPPORT']
+   puts 'LOADING ACTIVE SUPPORT!!!! Hopefully it all still works'
+   require 'active_support/all'
+   require 'active_support'
+   require 'active_support/json'
+end

data/spec/support/pact_helper.rb

@@ -1,6 +1,7 @@
+# This is the pact_helper for rake pact:tests
 require 'json'
 require 'pact/provider/rspec'
-# pact_helper for rake pact:tests
+require './spec/support/active_support_if_configured'
 
 module Pact
 	module Test

data/spec/support/shared_examples_for_request.rb

@@ -59,10 +59,21 @@ shared_examples "a request" do
 
     subject { described_class.from_hash(raw_request) }
 
-    its(:method) { should == 'get' }
-    its(:path) { should == '/mallory' }
-    its(:body) { should == 'hello mallory' }
-    its(:query) { should eq 'query'}
+    it "extracts the method" do
+      expect(subject.method).to eq 'get'
+    end
+
+    it "extracts the path" do
+      expect(subject.path).to eq '/mallory'
+    end
+
+    it "extracts the body" do
+      expect(subject.body).to eq 'hello mallory'
+    end
+
+    it "extracts the query" do
+      expect(subject.query).to eq 'query'
+    end
 
     it "blows up if method is absent" do
       raw_request.delete 'method'

data/spec/support/spec_support.rb

@@ -1,5 +1,8 @@
 module Pact
   module SpecSupport
+
+    extend self
+
     def remove_ansicolor string
       string.gsub(/\e\[(\d+)m/, '')
     end

data/spec/support/stubbing_using_allow.rb

@@ -1,5 +1,6 @@
 require 'pact/provider/rspec'
 require 'rspec/mocks'
+require './spec/support/active_support_if_configured'
 
 class StubbedThing
   def self.stub_me

data/spec/support/term.json

@@ -15,7 +15,19 @@
             },
             "response": {
                 "status": 200,
-                "headers" : {"Content-type": "application/json"},
+                "headers" : {
+                    "Content-type": {
+                      "json_class": "Pact::Term",
+                      "data": {
+                        "generate": "text/plain",
+                        "matcher": {
+                          "json_class": "Regexp",
+                          "o": 0,
+                          "s": "text"
+                        }
+                      }
+                    }
+                },
                 "body": {
                     "message" : {
                       "json_class": "Pact::Term",

data/tasks/pact-test.rake

@@ -1,7 +1,8 @@
-require 'pact/tasks'
+require 'pact/tasks/verification_task'
+require 'open3'
 
 Pact::VerificationTask.new(:stubbing) do | pact |
-	pact.uri './spec/support/stubbing.json', :pact_helper => './spec/support/stubbing.rb'
+	pact.uri './spec/support/stubbing.json', :pact_helper => './spec/support/stubbing'
 end
 
 Pact::VerificationTask.new(:stubbing_using_allow) do | pact |
@@ -13,6 +14,7 @@ Pact::VerificationTask.new(:pass) do | pact |
 end
 
 Pact::VerificationTask.new(:fail) do | pact |
+	pact.uri './spec/support/test_app_pass.json'
 	pact.uri './spec/support/test_app_fail.json'
 end
 
@@ -28,49 +30,66 @@ RSpec::Core::RakeTask.new('spec:standalone:pass') do | task |
 	task.pattern = FileList["spec/standalone/**/*_pass_test.rb"]
 end
 
+Pact::VerificationTask.new('test_app:pass') do | pact |
+	pact.uri './spec/support/test_app_pass.json'
+end
+
+Pact::VerificationTask.new('test_app:fail') do | pact |
+	pact.uri './spec/support/test_app_fail.json', pact_helper: './spec/support/pact_helper.rb'
+end
+
+task :bethtest => ['pact:tests:all','pact:tests:all:with_active_support']
+
 namespace :pact do
 
+	desc "All the verification tests"
+	task "tests:all" do
+		Rake::Task['pact:verify:stubbing'].execute
+		Rake::Task['pact:verify:stubbing_using_allow'].execute
+		Rake::Task['spec:standalone:pass'].execute
+		Rake::Task['pact:verify'].execute
+		Rake::Task['pact:verify:test_app:pass'].execute
+		Rake::Task['pact:test:fail'].execute
+	end
+
+	desc "All the verification tests with active support loaded"
+	task 'tests:all:with_active_support' => :set_active_support_on do
+		Rake::Task['pact:tests:all'].execute
+	end
+
 	desc 'Runs pact tests against a sample application, testing failure and success.'
-	task :tests => ['pact:verify:stubbing','pact:verify:stubbing_using_allow'] do
+	task 'test:fail' do
 
-		require 'pact/provider/pact_spec_runner'
 		require 'open3'
 
 		silent = true
-		puts "Running task pact:tests"
 		# Run these specs silently, otherwise expected failures will be written to stdout and look like unexpected failures.
-		Pact.configuration.output_stream = StringIO.new if silent
-
-		result = Pact::Provider::PactSpecRunner.new([{ uri: './spec/support/test_app_pass.json' }], silent: silent).run
-		fail 'Expected pact to pass' unless (result == 0)
-
-		result = Pact::Provider::PactSpecRunner.new([{ uri: './spec/support/test_app_fail.json', pact_helper: './spec/support/pact_helper.rb' }], silent: silent).run
-		fail 'Expected pact to fail' if (result == 0)
-
-		expect_to_pass "bundle exec rake pact:verify"
-		expect_to_pass "bundle exec rake pact:verify:at[./spec/support/test_app_pass.json]"
-		expect_to_fail "bundle exec rake pact:verify:at[./spec/support/test_app_fail.json]"
-		expect_to_fail "bundle exec rake spec:standalone:fail"
+		#Pact.configuration.output_stream = StringIO.new if silent
 
-		puts "Task pact:tests completed succesfully."
+		expect_to_fail "bundle exec rake pact:verify:test_app:fail", with: [/Could not find one or more provider states/]
+		expect_to_fail "bundle exec rake spec:standalone:fail", with: [/Actual interactions do not match expected interactions/]
+		expect_to_fail "bundle exec rake pact:verify:term", with: [%r{"Content-type" with value /text/}]
 	end
 
-	def expect_to_fail command
-		success = execute_command command
+	def expect_to_fail command, options = {}
+		success = execute_command command, options
 		fail "Expected '#{command}' to fail" if success
 	end
 
-	def expect_to_pass command
-		success = execute_command command
-		fail "Expected '#{command}' to pass" unless success
-	end
-
-	def execute_command command
+	def execute_command command, options
 		result = nil
 		Open3.popen3(command) {|stdin, stdout, stderr, wait_thr|
 		  result = wait_thr.value
+		  ensure_patterns_present(options, stdout, stderr) if options[:with]
 		}
 		result.success?
 	end
 
+	def ensure_patterns_present options, stdout, stderr
+		output = stdout.read + stderr.read
+		options[:with].each do | pattern |
+			raise (::Term::ANSIColor.red("Could not find #{pattern.inspect} in output of #{command}").red + "\n\n#{output}") unless output =~ pattern
+		end
+	end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -302,6 +302,7 @@ files:
 - documentation/Testing with pact.png
 - documentation/best-practices.md
 - documentation/configuration.md
+- documentation/development-workflow.md
 - documentation/diff_formatter_embedded.png
 - documentation/diff_formatter_list.png
 - documentation/diff_formatter_unix.png
@@ -309,6 +310,8 @@ files:
 - documentation/provider-states.md
 - documentation/raq.md
 - documentation/terminology.md
+- documentation/troubleshooting.md
+- documentation/verifying-pacts.md
 - example/animal-service/Gemfile
 - example/animal-service/Gemfile.lock
 - example/animal-service/Rakefile
@@ -375,11 +378,11 @@ files:
 - lib/pact/doc/generate.rb
 - lib/pact/doc/generator.rb
 - lib/pact/doc/interaction_view_model.rb
+- lib/pact/doc/markdown/consumer_contract_renderer.rb
 - lib/pact/doc/markdown/generator.rb
 - lib/pact/doc/markdown/index_renderer.rb
 - lib/pact/doc/markdown/interaction.erb
 - lib/pact/doc/markdown/interaction_renderer.rb
-- lib/pact/doc/markdown/interactions_renderer.rb
 - lib/pact/doc/sort_interactions.rb
 - lib/pact/logging.rb
 - lib/pact/matchers.rb
@@ -399,15 +402,15 @@ files:
 - lib/pact/matchers/unexpected_index.rb
 - lib/pact/matchers/unexpected_key.rb
 - lib/pact/matchers/unix_diff_formatter.rb
+- lib/pact/project_root.rb
 - lib/pact/provider.rb
-- lib/pact/provider/client_project_pact_helper.rb
 - lib/pact/provider/configuration.rb
 - lib/pact/provider/configuration/configuration_extension.rb
 - lib/pact/provider/configuration/dsl.rb
 - lib/pact/provider/configuration/pact_verification.rb
 - lib/pact/provider/configuration/service_provider_config.rb
 - lib/pact/provider/configuration/service_provider_dsl.rb
-- lib/pact/provider/matchers.rb
+- lib/pact/provider/context.rb
 - lib/pact/provider/matchers/messages.rb
 - lib/pact/provider/pact_helper_locator.rb
 - lib/pact/provider/pact_spec_runner.rb
@@ -415,7 +418,9 @@ files:
 - lib/pact/provider/print_missing_provider_states.rb
 - lib/pact/provider/request.rb
 - lib/pact/provider/rspec.rb
+- lib/pact/provider/rspec/custom_options_file
 - lib/pact/provider/rspec/formatter.rb
+- lib/pact/provider/rspec/matchers.rb
 - lib/pact/provider/rspec/silent_json_formatter.rb
 - lib/pact/provider/state/provider_state.rb
 - lib/pact/provider/state/provider_state_configured_modules.rb
@@ -425,6 +430,7 @@ files:
 - lib/pact/provider/verification_report.rb
 - lib/pact/provider/world.rb
 - lib/pact/reification.rb
+- lib/pact/rspec.rb
 - lib/pact/shared/active_support_support.rb
 - lib/pact/shared/dsl.rb
 - lib/pact/shared/jruby_support.rb
@@ -448,6 +454,7 @@ files:
 - spec/integration/consumer_spec.rb
 - spec/integration/pact/consumer_configuration_spec.rb
 - spec/integration/pact/provider_configuration_spec.rb
+- spec/lib/pact/app_spec.rb
 - spec/lib/pact/configuration_spec.rb
 - spec/lib/pact/consumer/app_manager_spec.rb
 - spec/lib/pact/consumer/configuration_spec.rb
@@ -469,8 +476,8 @@ files:
 - spec/lib/pact/consumer_contract/request_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
 - spec/lib/pact/doc/markdown/index_renderer_spec.rb
-- spec/lib/pact/doc/markdown/interactions_renderer_spec.rb
 - spec/lib/pact/matchers/differ_spec.rb
 - spec/lib/pact/matchers/difference_spec.rb
 - spec/lib/pact/matchers/embedded_diff_formatter_spec.rb
@@ -489,7 +496,6 @@ files:
 - spec/lib/pact/provider/configuration_spec.rb
 - spec/lib/pact/provider/matchers/messages_spec.rb
 - 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/request_spec.rb
 - spec/lib/pact/provider/rspec/formatter_spec.rb
@@ -504,13 +510,15 @@ files:
 - spec/lib/pact/shared/request_spec.rb
 - spec/lib/pact/something_like_spec.rb
 - spec/lib/pact/tasks/task_helper_spec.rb
+- spec/lib/pact/tasks/verification_task_spec.rb
 - spec/lib/pact/term_spec.rb
-- spec/lib/pact/verification_task_spec.rb
+- spec/pact_specification/compliance-1.0.0.rb
 - spec/spec_helper.rb
 - spec/standalone/consumer_fail_test.rb
 - spec/standalone/consumer_pass_test.rb
 - spec/support/a_consumer-a_producer.json
 - spec/support/a_consumer-a_provider.json
+- spec/support/active_support_if_configured.rb
 - spec/support/app_for_config_ru.rb
 - spec/support/consumer_contract_template.json
 - spec/support/dsl_spec_support.rb
@@ -547,7 +555,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3889300722258368097
+      hash: 3393348357730131022
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -556,7 +564,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3889300722258368097
+      hash: 3393348357730131022
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -572,6 +580,7 @@ test_files:
 - spec/integration/consumer_spec.rb
 - spec/integration/pact/consumer_configuration_spec.rb
 - spec/integration/pact/provider_configuration_spec.rb
+- spec/lib/pact/app_spec.rb
 - spec/lib/pact/configuration_spec.rb
 - spec/lib/pact/consumer/app_manager_spec.rb
 - spec/lib/pact/consumer/configuration_spec.rb
@@ -593,8 +602,8 @@ test_files:
 - spec/lib/pact/consumer_contract/request_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
 - spec/lib/pact/doc/markdown/index_renderer_spec.rb
-- spec/lib/pact/doc/markdown/interactions_renderer_spec.rb
 - spec/lib/pact/matchers/differ_spec.rb
 - spec/lib/pact/matchers/difference_spec.rb
 - spec/lib/pact/matchers/embedded_diff_formatter_spec.rb
@@ -613,7 +622,6 @@ test_files:
 - spec/lib/pact/provider/configuration_spec.rb
 - spec/lib/pact/provider/matchers/messages_spec.rb
 - 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/request_spec.rb
 - spec/lib/pact/provider/rspec/formatter_spec.rb
@@ -628,13 +636,15 @@ test_files:
 - spec/lib/pact/shared/request_spec.rb
 - spec/lib/pact/something_like_spec.rb
 - spec/lib/pact/tasks/task_helper_spec.rb
+- spec/lib/pact/tasks/verification_task_spec.rb
 - spec/lib/pact/term_spec.rb
-- spec/lib/pact/verification_task_spec.rb
+- spec/pact_specification/compliance-1.0.0.rb
 - spec/spec_helper.rb
 - spec/standalone/consumer_fail_test.rb
 - spec/standalone/consumer_pass_test.rb
 - spec/support/a_consumer-a_producer.json
 - spec/support/a_consumer-a_provider.json
+- spec/support/active_support_if_configured.rb
 - spec/support/app_for_config_ru.rb
 - spec/support/consumer_contract_template.json
 - spec/support/dsl_spec_support.rb

data/lib/pact/provider/client_project_pact_helper.rb

@@ -1,4 +0,0 @@
-require 'pact/provider/pact_helper_locator'
-pact_helper_path = Pact::Provider::PactHelperLocater.pact_helper_path
-load pact_helper_path
-puts "Using #{pact_helper_path}"

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

@@ -1,7 +0,0 @@
-require 'spec_helper'
-require 'pact/provider/pact_spec_runner'
-
-module Pact::Provider
-  describe PactSpecRunner do
-  end
-end

data/spec/lib/pact/verification_task_spec.rb

@@ -1,99 +0,0 @@
-require 'spec_helper'
-require 'pact/tasks/verification_task'
-
-module Pact
-  describe VerificationTask do
-    before :all do
-      @support_file = nil
-      @pact_helper = '/custom/path/support_file.rb'
-      @pact_uri = 'http://example.org/pact.json'
-      @task_name = 'pact:verify:pact_rake_spec'
-      @task_name_with_explict_support_file = 'pact:verify:pact_rake_spec_with_explict_support_file'
-      @consumer = 'some-consumer'
-      @criteria = {:description => /wiffle/}
-
-      VerificationTask.new(:pact_rake_spec_with_explict_support_file) do | pact |
-        pact.uri @pact_uri, support_file: @support_file, pact_helper: @pact_helper
-      end
-
-      VerificationTask.new(:pact_rake_spec) do | pact |
-        pact.uri @pact_uri
-      end
-    end
-
-    after :each do
-      ENV.delete 'PACT_DESCRIPTION'
-    end
-
-    before do
-      ENV['PACT_DESCRIPTION'] = 'wiffle'
-      VerificationTask.any_instance.stub(:publish_report)
-      Provider::PactSpecRunner.stub(:new).with(consumer_contract, options).and_return(pact_spec_runner)
-    end
-
-    let(:pact_spec_runner) { double('PactSpecRunner', :run => exit_code, :output => nil)}
-    let(:exit_code) {0}
-    let(:consumer_contract) { [ uri: @pact_uri, support_file: nil, pact_helper: nil ] }
-    let(:options) { {criteria: @criteria} }
-
-
-    describe '.initialize' do
-      context 'with an explict support_file' do
-        it 'creates the tasks' do
-          Rake::Task.tasks.should include_task @task_name
-        end
-      end
-      context 'with no explict support_file' do
-        it 'creates the tasks' do
-          Rake::Task.tasks.should include_task @task_name_with_explict_support_file
-        end
-      end
-    end
-
-    describe 'execute' do
-
-
-      context "with no explicit support file " do
-        it 'verifies the pacts using PactSpecRunner' do
-          Rake::Task[@task_name].execute
-        end
-      end
-
-      context "with an explict support_file" do
-        let(:consumer_contract) { [ uri: @pact_uri, support_file: @support_file, pact_helper: @pact_helper] }
-        it 'verifies the pacts using PactSpecRunner' do
-          Rake::Task[@task_name_with_explict_support_file].execute
-        end
-      end
-
-      context "with criteria" do
-        it 'passes the criteria to the PactSpecRunner as regexes' do
-          ENV.delete 'PACT_DESCRIPTION'
-          Provider::PactSpecRunner.should_receive(:new).with(
-            consumer_contract, {
-              criteria: {
-                description: /stuff/,
-                provider_state: /things/
-              }
-            }
-          ).and_return(pact_spec_runner)
-          Rake::Task[@task_name].execute(description: 'stuff', provider_state: 'things')
-        end
-      end
-
-      context 'when all specs pass' do
-
-        it 'does not raise an exception' do
-          Rake::Task[@task_name].execute
-        end
-      end
-
-    end
-  end
-end
-
-RSpec::Matchers.define :include_task do |expected|
-  match do |actual|
-    actual.any? { |task| task.name == expected }
-  end
-end