pact 1.1.0 → 1.1.1

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/tasks/pact.rake

@@ -3,32 +3,26 @@ namespace :pact do
 
   desc "Verifies the pact files configured in the pact_helper.rb against this service provider."
   task :verify do
-    require 'pact/provider'
+
     require 'pact/tasks/task_helper'
-    require 'pact/provider/client_project_pact_helper'
 
     include Pact::TaskHelper
 
     handle_verification_failure do
-      options = {criteria: spec_criteria}
-      pact_verifications = Pact.configuration.pact_verifications
-      verification_configs = pact_verifications.collect { | pact_verification | { :uri => pact_verification.uri }}
-      raise "Please configure a pact to verify" if verification_configs.empty?
-      Pact::Provider::PactSpecRunner.new(verification_configs, options).run
+      execute_pact_verify
     end
   end
 
   desc "Verifies the pact at the given URI against this service provider."
   task 'verify:at', :pact_uri do | t, args |
-    require 'pact/provider'
+    require 'term/ansicolor'
     require 'pact/tasks/task_helper'
 
     include Pact::TaskHelper
 
+    abort(::Term::ANSIColor.red("Please provide a pact URI. eg. rake pact:verify:at[../my-consumer/spec/pacts/my_consumer-my_provider.json]")) unless args[:pact_uri]
     handle_verification_failure do
-      puts "Verifying pact at uri #{args[:pact_uri]}"
-      options = {criteria: spec_criteria}
-      Pact::Provider::PactSpecRunner.new([{uri: args[:pact_uri]}], options).run
+      execute_pact_verify args[:pact_uri]
     end
   end
 

data/spec/integration/pact/consumer_configuration_spec.rb

@@ -53,7 +53,7 @@ describe "consumer side" do
       end
 
       it "should have registered the app" do
-        Pact::Consumer::AppManager.instance.app_registered_on?(1111).should be_true
+        Pact::Consumer::AppManager.instance.app_registered_on?(1111).should be true
       end
     end
 
@@ -67,13 +67,13 @@ describe "consumer side" do
 
       context "when standalone is true" do
         it "is not registerd with the AppManager" do
-          Pact::Consumer::AppManager.instance.app_registered_on?(1234).should be_false
+          Pact::Consumer::AppManager.instance.app_registered_on?(1234).should be false
         end
       end
 
       context "when standalone is false" do
         it "should register the MockServices on their given ports if they are not" do
-          Pact::Consumer::AppManager.instance.app_registered_on?(1235).should be_true
+          Pact::Consumer::AppManager.instance.app_registered_on?(1235).should be true
         end
       end
     end

data/spec/lib/pact/app_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+require 'pact/app'
+
+module Pact
+  describe SpecCriteria do
+
+    describe "#spec_criteria" do
+
+      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(:defaults) { {:description => default_description, :provider_state => default_provider_state} }
+
+      let(:subject) { Pact::App.new }
+
+      context "when ENV variables are defined" do
+        before do
+          ENV.stub(:[])
+          ENV.stub(:[]).with("PACT_DESCRIPTION").and_return(env_description)
+          ENV.stub(:[]).with("PACT_PROVIDER_STATE").and_return(env_provider_state)
+        end
+
+        it "returns the env vars as regexes" do
+          expect(SpecCriteria.call).to eq(env_criteria)
+        end
+      end
+
+      context "when ENV variables are not defined" do
+        it "returns an empty hash" do
+          expect(SpecCriteria.call).to eq({})
+        end
+      end
+
+      context "when provider state is an empty string" do
+        before do
+          ENV.stub(:[]).with(anything).and_return(nil)
+          ENV.stub(:[]).with("PACT_PROVIDER_STATE").and_return('')
+        end
+
+        it "returns a nil provider state so that it matches a nil provider state on the interaction" do
+          expect(SpecCriteria.call[:provider_state]).to be_nil
+        end
+      end
+    end
+  end
+end

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

@@ -21,7 +21,7 @@ module Pact::Consumer
 
         it "registers the mock service as running on the given port" do
           AppManager.instance.register_mock_service_for name, url
-          AppManager.instance.app_registered_on?(1234).should be_true
+          AppManager.instance.app_registered_on?(1234).should be true
         end
       end
       context "for https://" do

data/spec/lib/pact/consumer/mock_service/interaction_list_spec.rb

@@ -34,7 +34,7 @@ module Pact::Consumer
         include_context "unexpected requests and missed interactions"
         let(:expected_diff) {
           {:missing_interactions=>["GET /path"],
-            :unexpected_requests=>["PUT /path"],
+            :unexpected_requests=>["PUT /path?query"],
             :interaction_mismatches => ['blah']}
         }
         it "returns the unexpected requests and missed interactions" do
@@ -57,13 +57,13 @@ module Pact::Consumer
       context "when unexpected requests or missed interactions exist" do
         include_context "unexpected requests and missed interactions"
         it "returns false" do
-          expect(subject.all_matched?).to be_false
+          expect(subject.all_matched?).to be false
         end
       end
       context "when unexpected requests or missed interactions do not exist" do
         include_context "no unexpected requests or missed interactions exist"
         it "returns false" do
-          expect(subject.all_matched?).to be_true
+          expect(subject.all_matched?).to be true
         end
       end
     end

data/spec/lib/pact/consumer/mock_service/verification_get_spec.rb

@@ -11,9 +11,17 @@ module Pact
 
       subject { VerificationGet.new('VerificationGet', logger, interaction_list, log_description) }
 
-      its(:request_path) { should eq '/verify'}
-      its(:request_method) { should eq 'GET'}
+      describe "request_path" do
+        it "is /verify" do
+          expect(subject.request_path).to eq '/verify'
+        end
+      end
 
+      describe "request_method" do
+        it "is GET" do
+          expect(subject.request_method).to eq 'GET'
+        end
+      end
 
       describe "#respond" do
         let(:env) { {

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

@@ -39,7 +39,7 @@ describe Pact::Consumer::MockServiceInteractionExpectation do
 
     context "without options" do
       it "does not include the options key" do
-        expect(subject.as_json.key?(:options)).to be_false
+        expect(subject.as_json.key?(:options)).to be false
       end
     end
 
@@ -50,5 +50,5 @@ describe Pact::Consumer::MockServiceInteractionExpectation do
       end
     end
   end
-   
+
 end

data/spec/lib/pact/consumer_contract/consumer_contract_spec.rb

@@ -169,7 +169,7 @@ eos
       end
 
       it "should write to a file specified by the consumer and provider name" do
-        File.exist?(expected_pact_path).should be_true
+        File.exist?(expected_pact_path).should be true
       end
 
       it "should write the interactions to the file" do

data/spec/lib/pact/consumer_contract/interaction_spec.rb

@@ -12,13 +12,13 @@ module Pact
         context "when other is the same" do
           let(:other) { InteractionFactory.create }
           it "returns true" do
-            expect(subject == other).to be_true
+            expect(subject == other).to be true
           end
         end
         context "when other is not the same" do
           let(:other) { InteractionFactory.create(:request => {:path => '/a_different_path'}) }
           it "returns false" do
-            expect(subject == other).to be_false
+            expect(subject == other).to be false
           end
         end
       end
@@ -28,12 +28,12 @@ module Pact
         context "by description" do
           context "when the interaction matches" do
             it "returns true" do
-              expect(subject.matches_criteria?(:description => /request.*food/)).to be_true
+              expect(subject.matches_criteria?(:description => /request.*food/)).to be true
             end
           end
           context "when the interaction does not match" do
             it "returns false" do
-              expect(subject.matches_criteria?(:description => /blah/)).to be_false
+              expect(subject.matches_criteria?(:description => /blah/)).to be false
             end
           end
         end

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

@@ -24,13 +24,13 @@ module Pact
           expect(subject.headers).to be_instance_of(Pact::NullExpectation)
         end
       end
-    end    
+    end
 
     describe "as_json" do
       subject { Request::Expected.new(:get, '/path', {:header => 'value'}, {:body => 'yeah'}, "query", {some: 'options'}) }
       context "with options" do
         it "does not include the options because they are a temporary hack and should leave no trace of themselves in the pact file" do
-          expect(subject.as_json.key?(:options)).to be_false
+          expect(subject.as_json.key?(:options)).to be false
         end
       end
     end
@@ -55,7 +55,7 @@ module Pact
       let(:actual_query) { '' }
 
       it "matches identical requests" do
-        expect(subject.matches? actual_request).to be_true
+        expect(subject.matches? actual_request).to be true
       end
 
       context "when the methods are the same but one is symbolized" do
@@ -63,7 +63,7 @@ module Pact
         let(:actual_method) { 'get' }
 
         it "matches" do
-          expect(subject.matches? actual_request).to be_true
+          expect(subject.matches? actual_request).to be true
         end
       end
 
@@ -72,7 +72,7 @@ module Pact
         let(:actual_method) { 'post' }
 
         it "does not match" do
-          expect(subject.matches? actual_request).to be_false
+          expect(subject.matches? actual_request).to be false
         end
       end
 
@@ -81,7 +81,7 @@ module Pact
         let(:actual_path) { '/bar' }
 
         it "does not match" do
-          expect(subject.matches? actual_request).to be_false
+          expect(subject.matches? actual_request).to be false
         end
       end
 
@@ -90,7 +90,7 @@ module Pact
         let(:actual_path) { '/foo/' }
 
         it "matches" do
-          expect(subject.matches? actual_request).to be_true
+          expect(subject.matches? actual_request).to be true
         end
       end
 
@@ -99,7 +99,7 @@ module Pact
         let(:actual_body) { '' }
 
         it "does not match" do
-          expect(subject.matches? actual_request).to be_false
+          expect(subject.matches? actual_request).to be false
         end
       end
 
@@ -108,7 +108,7 @@ module Pact
         let(:actual_body) { '' }
 
         it "matches" do
-          expect(subject.matches? actual_request).to be_true
+          expect(subject.matches? actual_request).to be true
         end
       end
 
@@ -122,7 +122,7 @@ module Pact
         let(:actual_body) { nil }
 
         it "does not match" do
-          expect(subject.matches? actual_request).to be_false
+          expect(subject.matches? actual_request).to be false
         end
       end
 
@@ -131,7 +131,7 @@ module Pact
         let(:actual_body) { 'bar' }
 
         it "does not match" do
-          expect(subject.matches? actual_request).to be_false
+          expect(subject.matches? actual_request).to be false
         end
       end
 
@@ -151,7 +151,7 @@ module Pact
         end
 
         it "matches" do
-          expect(subject.matches? actual_request).to be_true
+          expect(subject.matches? actual_request).to be true
         end
       end
 
@@ -171,7 +171,7 @@ module Pact
         end
 
         it "does not match" do
-          expect(subject.matches? actual_request).to be_false
+          expect(subject.matches? actual_request).to be false
         end
       end
 
@@ -191,7 +191,7 @@ module Pact
         end
 
         it "matches" do
-          expect(subject.matches? actual_request).to be_true
+          expect(subject.matches? actual_request).to be true
         end
       end
 
@@ -211,7 +211,7 @@ module Pact
         end
 
         it "does not match" do
-          expect(subject.matches? actual_request).to be_false
+          expect(subject.matches? actual_request).to be false
         end
       end
 
@@ -231,7 +231,7 @@ module Pact
         end
 
         it "does not match" do
-          expect(subject.matches? actual_request).to be_false
+          expect(subject.matches? actual_request).to be false
         end
       end
       context "when the expected body contains non-matching hash where one field contains a substring of the other" do
@@ -248,7 +248,7 @@ module Pact
           end
 
           it "does not match" do
-            expect(subject.matches? actual_request).to be_false
+            expect(subject.matches? actual_request).to be false
           end
       end
 
@@ -268,7 +268,7 @@ module Pact
         end
 
         it "does not match" do
-          expect(subject.matches? actual_request).to be_true
+          expect(subject.matches? actual_request).to be true
         end
       end
 
@@ -277,7 +277,7 @@ module Pact
         let(:actual_query) { 'bar' }
 
         it "does not match" do
-          expect(subject.matches? actual_request).to be_false
+          expect(subject.matches? actual_request).to be false
         end
       end
 
@@ -286,7 +286,7 @@ module Pact
         let(:actual_query) { 'bar' }
 
         it 'matches' do
-          expect(subject.matches? actual_request).to be_true
+          expect(subject.matches? actual_request).to be true
         end
       end
 
@@ -295,7 +295,7 @@ module Pact
         let(:expected_body) { { thing: "123" } }
 
         it 'does not match' do
-          expect(subject.matches? actual_request).to be_false
+          expect(subject.matches? actual_request).to be false
         end
       end
 
@@ -305,13 +305,13 @@ module Pact
         context "when allowing unexpected keys" do
           let(:options) { {'allow_unexpected_keys_in_body' => true} } #From json, these will be strings
           it "matches" do
-            expect(subject.matches? actual_request).to be_true
+            expect(subject.matches? actual_request).to be true
           end
         end
         context "when not allowing unexpected keys" do
           let(:options) { {'allow_unexpected_keys_in_body' => false} }
           it "does not match" do
-            expect(subject.matches? actual_request).to be_false
+            expect(subject.matches? actual_request).to be false
           end
         end
       end

data/spec/lib/pact/doc/generator_spec.rb

@@ -9,7 +9,7 @@ module Pact
       let(:doc_dir) { './tmp/doc' }
       let(:pact_dir) { './tmp/pacts' }
       let(:file_name) { "Some Consumer - Some Provider#{file_extension}" }
-      let(:interactions_renderer) { double("InteractionsRenderer", :call => doc_content) }
+      let(:consumer_contract_renderer) { double("ConsumerContractRenderer", :call => doc_content) }
       let(:doc_content) { "doc_content" }
       let(:index_content) { "index_content" }
       let(:expected_doc_path) { "#{doc_dir}/#{doc_type}/#{file_name}" }
@@ -30,7 +30,7 @@ module Pact
         FileUtils.cp './spec/support/markdown_pact.json', pact_dir
       end
 
-      let(:options) { { interactions_renderer: interactions_renderer, doc_type: doc_type, file_extension: file_extension, index_renderer: index_renderer, index_name: index_name } }
+      let(:options) { { consumer_contract_renderer: consumer_contract_renderer, doc_type: doc_type, file_extension: file_extension, index_renderer: index_renderer, index_name: index_name } }
 
       subject { Generator.new(pact_dir, doc_dir, options) }
 
@@ -43,9 +43,9 @@ module Pact
         end
 
         it "clears the existing files" do
-          expect(File.exist?(existing_doc_file_path)).to be_true
+          expect(File.exist?(existing_doc_file_path)).to be true
           subject.call
-          expect(File.exist?(existing_doc_file_path)).to be_false
+          expect(File.exist?(existing_doc_file_path)).to be false
         end
       end