pact 1.1.0 → 1.1.1

data/spec/lib/pact/doc/markdown/{interactions_renderer_spec.rb → consumer_contract_renderer_spec.rb}

@@ -1,12 +1,12 @@
 require 'spec_helper'
-require 'pact/doc/markdown/interactions_renderer'
+require 'pact/doc/markdown/consumer_contract_renderer'
 
 module Pact
   module Doc
     module Markdown
-      describe InteractionsRenderer do
+      describe ConsumerContractRenderer do
 
-        subject { InteractionsRenderer.new(consumer_contract) }
+        subject { ConsumerContractRenderer.new(consumer_contract) }
         let(:consumer_contract) { Pact::ConsumerContract.from_uri './spec/support/markdown_pact.json' }
 
         let(:expected_output) { File.read("./spec/support/generated_markdown.md") }
@@ -19,7 +19,7 @@ module Pact
 
         describe ".call" do
           it "renders an interaction" do
-            expect(InteractionsRenderer.call consumer_contract).to eq(expected_output)
+            expect(ConsumerContractRenderer.call consumer_contract).to eq(expected_output)
           end
         end
 

data/spec/lib/pact/matchers/unix_diff_formatter_spec.rb

@@ -54,7 +54,7 @@ EOF
           end
 
           it "generates the right number of lines, even with ActiveSupport loaded" do
-            expect(line_count).to eq 10
+            expect(line_count).to eq 9
           end
 
         end
@@ -76,7 +76,7 @@ EOF
           end
 
           it "generates the right number of lines, even with ActiveSupport loaded" do
-            expect(line_count).to eq 10
+            expect(line_count).to eq 9
           end
 
         end
@@ -98,7 +98,7 @@ EOF
           end
 
           it "generates the right number of lines, even with ActiveSupport loaded" do
-            expect(line_count).to eq 6
+            expect(line_count).to eq 5
           end
 
         end
@@ -120,7 +120,7 @@ EOF
           end
 
           it "generates the right number of lines, even with ActiveSupport loaded" do
-            expect(line_count).to eq 9
+            expect(line_count).to eq 8
           end
         end
 
@@ -140,7 +140,7 @@ EOF
           end
 
           it "generates the right number of lines, even with ActiveSupport loaded" do
-            expect(line_count).to eq 9
+            expect(line_count).to eq 8
           end
 
         end
@@ -159,7 +159,7 @@ EOF
           end
 
           it "generates the right number of lines, even with ActiveSupport loaded" do
-            expect(line_count).to eq 9
+            expect(line_count).to eq 8
           end
 
         end
@@ -185,7 +185,7 @@ EOF
           end
 
           it "generates the right number of lines, even with ActiveSupport loaded" do
-            expect(line_count).to eq 9
+            expect(line_count).to eq 8
           end
 
         end
@@ -203,7 +203,7 @@ EOF
           end
 
           it "generates the right number of lines, even with ActiveSupport loaded" do
-            expect(line_count).to eq 12
+            expect(line_count).to eq 11
           end
 
         end

data/spec/lib/pact/provider/configuration/configuration_extension_spec.rb

@@ -14,12 +14,12 @@ module Pact
         describe "#color_enabled" do
 
           it "sets color_enabled to be true by default" do
-            expect(subject.color_enabled).to be_true
+            expect(subject.color_enabled).to be true
           end
 
           it "allows configuration of colour_enabled" do
             subject.color_enabled = false
-            expect(subject.color_enabled).to be_false
+            expect(subject.color_enabled).to be false
           end
 
         end

data/spec/lib/pact/provider/matchers/messages_spec.rb

@@ -10,9 +10,11 @@ module Pact
       describe "#match_term_failure_message" do
 
         let(:message) { "line1\nline2"}
+        let(:output_message) { "Actual: actual\n\n#{message}"}
+        let(:output_message_with_resets) { "Actual: actual\n\n#{r}line1\n#{r}line2"}
         let(:r) { ::Term::ANSIColor.reset }
-        let(:message_with_resets) { "#{r}line1\n#{r}line2"}
         let(:diff) { double("diff") }
+        let(:actual) { "actual" }
         let(:color_enabled) { true }
         let(:ansi_reset_at_start_of_line) { /^#{Regexp.escape ::Term::ANSIColor.reset}/ }
         let(:message_line_count) { message.split("\n").size }
@@ -21,7 +23,7 @@ module Pact
           allow(Pact.configuration.diff_formatter).to receive(:call).and_return(message)
         end
 
-        subject { match_term_failure_message diff, color_enabled }
+        subject { match_term_failure_message diff, actual, color_enabled }
 
         it "creates a message using the configured diff_formatter" do
           expect(Pact.configuration.diff_formatter).to receive(:call).with(diff)
@@ -31,17 +33,26 @@ module Pact
         context "when color_enabled is true" do
 
           it "returns the message with ANSI reset at the start of each line" do
-            expect(subject).to eq(message_with_resets)
+            expect(subject).to eq(output_message_with_resets)
           end
 
         end
 
+        context "when the actual is not a string" do
+
+          let(:actual) { {the: "actual"} }
+
+          it "includes the actual as json" do
+            expect(subject).to include(actual.to_json)
+          end
+        end
+
         context "when color_enabled is false" do
 
           let(:color_enabled) { false }
 
           it "returns the message unmodified" do
-            expect(subject).to eq(message)
+            expect(subject).to eq(output_message)
           end
 
         end
@@ -88,9 +99,9 @@ module Pact
 
         end
 
-        context "when the expected is a Pact::Term" do
+        context "when the expected is a regexp" do
 
-          let(:expected) { Pact::Term.new(matcher: /hal/, generate: 'application/hal+json')}
+          let(:expected) { /hal/ }
           let(:expected_message) { "Expected header \"Content-Type\" to match /hal/, but was \"text/plain\"" }
 
           it "creates a message with the term's matcher" do

data/spec/lib/pact/provider/rspec/formatter_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'pact/provider/rspec/formatter'
 require './spec/support/factories'
+require './spec/support/spec_support'
 
 module Pact
   module Provider
@@ -18,7 +19,8 @@ module Pact
         let(:missing_provider_states) { 'missing_provider_states'}
 
         subject { Formatter.new output }
-        let(:output_result) { output.string }
+
+        let(:output_result) { Pact::SpecSupport.remove_ansicolor output.string }
 
         before do
           allow(PrintMissingProviderStates).to receive(:call)

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

@@ -79,7 +79,7 @@ module Pact
        end
 
        it "calls finalize" do
-        expect(@test.finalized).to be_true
+        expect(@test.finalized).to be true
        end
     end
   end

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

@@ -72,6 +72,14 @@ module Pact
             expect(subject).to eq("GET /something")
           end
         end
+
+        context "with a query" do
+          subject { TestRequest.new("get", "/something", {}, {} , "test=query").method_and_path }
+
+          it "includes the query" do
+            expect(subject).to eq("GET /something?test=query")
+          end
+        end
       end
 
     end

data/spec/lib/pact/tasks/task_helper_spec.rb

@@ -1,80 +1,65 @@
 require 'spec_helper'
 require 'pact/tasks/task_helper'
+require 'rake/file_utils'
 
 module Pact
   describe TaskHelper do
-    include TaskHelper
 
-    let(:env_description) { "pact description set in ENV"}
-    let(:env_provider_state) { "provider state set in ENV"}
-    let(:env_criteria){ {:description=>/#{env_description}/, :provider_state=>/#{env_provider_state}/} }
-    let(:default_description) { "default description"}
-    let(:default_provider_state) { "default provider state"}
 
-    shared_context "PACT_DESCRIPTION is defined" do
-      before do
-        ENV.stub(:[])
-        ENV.stub(:[]).with("PACT_DESCRIPTION").and_return(env_description)
-      end
-    end
+    describe ".execute_pact_verify" do
+      let(:ruby_path) { "/path/to/ruby" }
+      let(:pact_uri) { "/pact/uri" }
+      let(:default_pact_helper_path) { "/pact/helper/path.rb" }
 
-    shared_context 'PACT_PROVIDER_STATE is defined' do
       before do
-        ENV.stub(:[])
-        ENV.stub(:[]).with("PACT_PROVIDER_STATE").and_return(env_provider_state)
+        stub_const("FileUtils::RUBY", ruby_path)
+        allow(Pact::Provider::PactHelperLocater).to receive(:pact_helper_path).and_return(default_pact_helper_path)
       end
-    end
-
-    shared_context 'default description is defined' do
-      let(:default_description) { "default description"}
-    end
-
-    let(:defaults) { {:description => default_description, :provider_state => default_provider_state} }
-
-    describe "spec_criteria" do
 
-      context "when ENV variables are defined" do
-        before do
-          ENV.stub(:fetch).with("PACT_DESCRIPTION", anything).and_return(env_description)
-          ENV.stub(:fetch).with("PACT_PROVIDER_STATE", anything).and_return(env_provider_state)
-        end
-
-        context "when defaults are not passed in" do
-          it "returns the env vars as regexes" do
-            expect(spec_criteria).to eq(env_criteria)
-          end
+      context "with no pact_helper or pact URI" do
+        let(:command) { "#{ruby_path} -S pact verify -h #{default_pact_helper_path}" }
+        it "executes the command" do
+          expect(TaskHelper).to receive(:execute_cmd).with(command)
+          TaskHelper.execute_pact_verify
         end
+      end
 
-        context "when defaults are passed in" do
-          it "returns the env vars as regexes" do
-            expect(spec_criteria(defaults)).to eq(env_criteria)
-          end
+      context "with a pact URI" do
+        let(:command) { "#{ruby_path} -S pact verify -h #{default_pact_helper_path} -p #{pact_uri}" }
+        it "executes the command" do
+          expect(TaskHelper).to receive(:execute_cmd).with(command)
+          TaskHelper.execute_pact_verify(pact_uri)
         end
       end
 
-      context "when ENV variables are not defined" do
-        context "when defaults are passed in" do
-          it "returns the defaults as regexes" do
-            expect(spec_criteria(defaults)).to eq({:description=>/#{default_description}/, :provider_state=>/#{default_provider_state}/})
-          end
-        end
-        context "when defaults are not passed in" do
-          it "returns an empty hash" do
-            expect(spec_criteria).to eq({})
-          end
+      context "with a pact URI and a pact_helper" do
+        let(:custom_pact_helper_path) { '/custom/pact_helper.rb' }
+        let(:command) { "#{ruby_path} -S pact verify -h #{custom_pact_helper_path} -p #{pact_uri}" }
+        it "executes the command" do
+          expect(TaskHelper).to receive(:execute_cmd).with(command)
+          TaskHelper.execute_pact_verify(pact_uri, custom_pact_helper_path)
         end
       end
 
-      context "when provider state is an empty string" do
-        before do
-          ENV.stub(:fetch).with(anything, anything).and_return(nil)
-          ENV.stub(:fetch).with("PACT_PROVIDER_STATE", anything).and_return('')
+      context "with a pact_helper with no .rb on the end" do
+        let(:custom_pact_helper_path) { '/custom/pact_helper' }
+        let(:command) { "#{ruby_path} -S pact verify -h #{custom_pact_helper_path}.rb -p #{pact_uri}" }
+        it "executes the command" do
+          expect(TaskHelper).to receive(:execute_cmd).with(command)
+          TaskHelper.execute_pact_verify(pact_uri, custom_pact_helper_path)
         end
+      end
 
-        it "returns a nil provider state so that it matches a nil provider state on the interaction" do
-          expect(spec_criteria[:provider_state]).to be_nil
+      context "with a pact URI and a nil pact_helper" do
+        let(:command) { "#{ruby_path} -S pact verify -h #{default_pact_helper_path} -p #{pact_uri}" }
+        it "executes the command" do
+          expect(TaskHelper).to receive(:execute_cmd).with(command)
+          TaskHelper.execute_pact_verify(pact_uri, nil)
         end
       end
+
     end
+
+
   end
 end

data/spec/lib/pact/tasks/verification_task_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+require 'pact/tasks/verification_task'
+
+module Pact
+  describe VerificationTask do
+    before :all do
+      @pact_helper = '/custom/path/pact_helper  .rb'
+      @pact_uri = 'http://example.org/pact.json'
+      @task_name = 'pact:verify:pact_rake_spec'
+      @task_name_with_explict_pact_helper = 'pact:verify:pact_rake_spec_with_explict_pact_helper'
+      @consumer = 'some-consumer'
+      @criteria = {:description => /wiffle/}
+
+      VerificationTask.new(:pact_rake_spec_with_explict_pact_helper) do | pact |
+        pact.uri @pact_uri, pact_helper: @pact_helper
+      end
+
+      VerificationTask.new(:pact_rake_spec) do | pact |
+        pact.uri @pact_uri
+      end
+    end
+
+    before do
+      allow(Pact::TaskHelper).to receive(:execute_pact_verify).and_return(0)
+    end
+
+    let(:exit_code) {0}
+
+
+    describe '.initialize' do
+      context 'with an explict pact_helper' do
+        it 'creates the tasks' do
+          Rake::Task.tasks.should include_task @task_name
+        end
+      end
+      context 'with no explict pact_helper' do
+        it 'creates the tasks' do
+          Rake::Task.tasks.should include_task @task_name_with_explict_pact_helper
+        end
+      end
+    end
+
+    describe 'execute' do
+
+      context "with no explicit pact_helper" do
+        it 'verifies the pacts using the TaskHelper' do
+          expect(Pact::TaskHelper).to receive(:execute_pact_verify).with(@pact_uri, nil)
+          Rake::Task[@task_name].execute
+        end
+      end
+
+      context "with an explict pact_helper" do
+        let(:verification_config) { [ uri: @pact_uri, pact_helper: @pact_helper] }
+        it 'verifies the pacts using the TaskHelper' do
+          expect(Pact::TaskHelper).to receive(:execute_pact_verify).with(@pact_uri, @pact_helper)
+          Rake::Task[@task_name_with_explict_pact_helper].execute
+        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

data/spec/pact_specification/compliance-1.0.0.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+require 'pact/consumer/request'
+require 'pact/consumer_contract/request'
+
+PACT_SPEC_DIR = "../pact-specification/testcases"
+REQUEST_TEST_CASE_FOLDERS = Dir.glob("#{PACT_SPEC_DIR}/request/**")
+REQUEST_TEST_CASE_FILES = Dir.glob("#{PACT_SPEC_DIR}/request/**/*.json")
+
+TEST_DESCRIPTIONS = {true => "matches", false => "does not match"}
+
+describe "Pact gem complicance with Pact Specification 1.0.0" do
+
+  directories = Dir.glob("#{PACT_SPEC_DIR}/*")
+
+  directories.each do | dir_name |
+
+    describe File.basename(dir_name) do
+
+      sub_directories = Dir.glob("#{dir_name}/*")
+
+      sub_directories.each do | sub_dir_name |
+
+        context File.basename(sub_dir_name) do
+          testcases = Dir.glob("#{sub_dir_name}/**/*.json")
+
+          testcases.each do | file_name |
+
+            context File.basename(file_name).chomp(".json") do
+
+              file_content = JSON.parse(File.read(file_name))
+              expected = Pact::Request::Expected.from_hash(file_content["expected"])
+              actual = Pact::Consumer::Request::Actual.from_hash(file_content["actual"])
+              expected_result = file_content.fetch("match")
+              comment = file_content["comment"]
+
+              it "#{TEST_DESCRIPTIONS[expected_result]} - #{comment}" do
+                expect(expected.matches?(actual)).to eq expected_result
+              end
+
+            end
+
+          end
+        end
+      end
+    end
+  end
+end