pact 1.0.9 → 1.0.10

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

@@ -0,0 +1,82 @@
+require 'spec_helper'
+require 'pact/consumer/mock_service/rack_request_helper'
+
+module Pact::Consumer
+
+  describe RackRequestHelper do
+    class TestSubject
+      include RackRequestHelper
+    end
+
+    let(:rack_env) {
+      {
+             "CONTENT_LENGTH" => "16",
+               "CONTENT_TYPE" => content_type,
+          "GATEWAY_INTERFACE" => "CGI/1.1",
+                  "PATH_INFO" => "/donuts",
+               "QUERY_STRING" => "",
+                "REMOTE_ADDR" => "127.0.0.1",
+                "REMOTE_HOST" => "localhost",
+             "REQUEST_METHOD" => "POST",
+                "REQUEST_URI" => "http://localhost:4321/donuts",
+                "SCRIPT_NAME" => "",
+                "SERVER_NAME" => "localhost",
+                "SERVER_PORT" => "4321",
+            "SERVER_PROTOCOL" => "HTTP/1.1",
+            "SERVER_SOFTWARE" => "WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)",
+                "HTTP_ACCEPT" => "text/plain",
+            "HTTP_USER_AGENT" => "Ruby",
+                  "HTTP_HOST" => "localhost:4321",
+               "rack.version" => [1, 2 ],
+                 "rack.input" => StringIO.new(body),
+                "rack.errors" => nil,
+           "rack.multithread" => true,
+          "rack.multiprocess" => false,
+              "rack.run_once" => false,
+            "rack.url_scheme" => "http",
+               "HTTP_VERSION" => "HTTP/1.1",
+               "REQUEST_PATH" => "/donuts"
+      }
+     }
+
+    subject { TestSubject.new }
+
+    let(:expected_request) {
+      {
+            :query => "",
+           :method => "post",
+             :body => expected_body,
+             :path => "/donuts",
+          :headers => {
+              "Content-Type" => content_type,
+                    "Accept" => "text/plain",
+                "User-Agent" => "Ruby",
+                      "Host" => "localhost:4321",
+                   "Version" => "HTTP/1.1"
+          }
+      }
+    }
+
+    context "with a text body" do
+      let(:content_type) { "application/x-www-form-urlencoded" }
+      let(:body) { 'this is the body' }
+      let(:expected_body) { body }
+
+      it "extracts the body" do
+        expect(subject.request_as_hash_from(rack_env)).to eq expected_request
+      end
+    end
+
+    context "with a json body" do
+      let(:content_type) { "application/json" }
+      let(:body) { '{"a" : "body" }' }
+      let(:expected_body) { {"a" => "body"} }
+
+      it "extracts the body" do
+        expect(subject.request_as_hash_from(rack_env)).to eq expected_request
+      end
+    end
+
+
+  end
+end

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

@@ -0,0 +1,54 @@
+require 'spec_helper'
+require 'pact/consumer/mock_service_interaction_expectation'
+
+describe Pact::Consumer::MockServiceInteractionExpectation do
+  describe "as_json" do
+    let(:options ) { {} }
+    let(:request_as_json) { {a: 'request'} }
+    let(:request) { instance_double('Pact::Request::Expected', :as_json => request_as_json, :options => options)}
+    let(:response) { double('response') }
+    let(:generated_response ) { double('generated_response', :to_json => 'generated_response') }
+    let(:interaction) { instance_double('Pact::Interaction', :description => 'description', :request => request, :response => response, :provider_state => 'some state') }
+    subject { described_class.new(interaction)}
+    let(:expected_hash) { {:response => generated_response, :request => as_json_with_options, :description => '' } }
+
+    before do
+      Pact::Reification.stub(:from_term).with(response).and_return(generated_response)
+    end
+
+    it "generates an actual response" do
+      Pact::Reification.should_receive(:from_term).with(response).and_return(generated_response)
+      expect(subject.as_json[:response]).to eq generated_response
+    end
+
+    it "includes the options in the request" do
+      expect(subject.as_json[:request]).to eq request_as_json
+    end
+
+    it "includes the provider state" do
+      expect(subject.as_json[:provider_state]).to eq 'some state'
+    end
+
+    it "includes the description" do
+      expect(subject.as_json[:description]).to eq 'description'
+    end
+
+    it "doesn't have any other keys" do
+      expect(subject.as_json.keys).to eq [:description, :provider_state, :request, :response]
+    end
+
+    context "without options" do
+      it "does not include the options key" do
+        expect(subject.as_json.key?(:options)).to be_false
+      end
+    end
+
+    context "with options" do
+      let(:options) { {:opts => 'blah'} }
+      it "includes the options in the request hash" do
+        expect(subject.as_json[:request][:options]).to eq options
+      end
+    end
+  end
+   
+end

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

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'support/shared_examples_for_request'
+
+module Pact
+  describe Consumer::Request::Actual do
+    it_behaves_like "a request"
+
+    let(:raw_request) do
+      {
+        'method' => 'get',
+        'path' => '/mallory'
+      }
+    end
+
+    describe "from_hash" do
+      context "when field are not defined" do
+        subject { described_class.from_hash(raw_request) }
+        it "raises an error" do
+          expect{subject}.to raise_error KeyError
+        end
+      end
+    end      
+  end
+end

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

@@ -45,7 +45,7 @@ module Pact
     describe ".from_json" do
       let(:loaded_pact) { ConsumerContract.from_json(string) }
       context "when the top level object is a ConsumerContract" do
-        let(:string) { '{"interactions":[{"request": {"path":"/path", "method" : "get"}}], "consumer": {"name" : "Bob"} }' }
+        let(:string) { '{"interactions":[{"request": {"path":"/path", "method" : "get"}}], "consumer": {"name" : "Bob"} , "provider": {"name" : "Mary"} }' }
 
         it "should create a Pact" do
           loaded_pact.should be_instance_of ConsumerContract

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

@@ -39,40 +39,6 @@ module Pact
         end
       end
 
-      describe "as_json_for_mock_service" do
-        let(:as_json_with_options ) { {:opts => 'blah'} }
-        let(:request) { double(Pact::Request::Expected, :as_json_with_options => {:opts => 'blah'})}
-        let(:response) { double('response') }
-        let(:generated_response ) { double('generated_response', :to_json => 'generated_response') }
-        subject { Interaction.new(:description => 'description', :request => request, :response => response, :provider_state => 'some state')}
-        let(:expected_hash) { {:response => generated_response, :request => as_json_with_options, :description => '' } }
-
-        before do
-          Reification.stub(:from_term).with(response).and_return(generated_response)
-        end
-
-        it "generates an actual response" do
-          Reification.should_receive(:from_term).with(response).and_return(generated_response)
-          expect(subject.as_json_for_mock_service[:response]).to eq generated_response
-        end
-
-        it "includes the options in the request" do
-          expect(subject.as_json_for_mock_service[:request]).to eq as_json_with_options
-        end
-
-        it "includes the provider state" do
-          expect(subject.as_json_for_mock_service[:provider_state]).to eq 'some state'
-        end
-
-        it "includes the description" do
-          expect(subject.as_json_for_mock_service[:description]).to eq 'description'
-        end
-
-        it "doesn't have any other keys" do
-          expect(subject.as_json_for_mock_service.keys).to eq [:response, :request, :description, :provider_state]
-        end
-      end
-
       describe "to JSON" do
         let(:request) do
           {

data/spec/lib/pact/{request_spec.rb → consumer_contract/request_spec.rb}

@@ -1,107 +1,35 @@
 require 'spec_helper'
-require 'pact/request'
+require 'pact/consumer_contract/request'
+require 'pact/consumer/request'
+require 'support/shared_examples_for_request'
 
-shared_examples "a request" do
-
-  describe 'matching' do
-    let(:expected) do
-      Pact::Request::Expected.from_hash(
-        {'method' => 'get', 'path' => 'path', 'query' => /b/}
-        )
-    end
-
-    let(:actual) do
-      Pact::Request::Actual.from_hash({'method' => 'get', 'path' => 'path', 'query' => 'blah'})
-    end
-
-    it "should match" do
-      expect(expected.difference(actual)).to eq({})
-    end
-  end
-
-  describe 'full_path' do
-    context "with empty path" do
-      subject { described_class.from_hash({:path => '', :method => 'get'}) }
-      it "returns the full path"do
-        expect(subject.full_path).to eq "/"
-      end
-    end
-    context "with a path" do
-      subject { described_class.from_hash({:path => '/path', :method => 'get'}) }
-      it "returns the full path"do
-        expect(subject.full_path).to eq "/path"
-      end
-    end
-    context "with a path and query" do
-      subject { described_class.from_hash({:path => '/path', :method => 'get', :query => "something"}) }
-      it "returns the full path"do
-        expect(subject.full_path).to eq "/path?something"
-      end
-    end
-  end
+module Pact
 
-  describe "building from a hash" do
+  describe Request::Expected do
+    it_behaves_like "a request"
 
     let(:raw_request) do
       {
         'method' => 'get',
-        'path' => '/mallory',
-        'headers' => {
-          'Content-Type' => 'application/json'
-        },
-        'body' => 'hello mallory'
+        'path' => '/mallory'
       }
     end
 
-    subject { described_class.from_hash(raw_request) }
-
-    its(:method) { should == 'get' }
-    its(:path) { should == '/mallory' }
-    its(:body) { should == 'hello mallory' }
-    its(:query) { should eq Pact::Request::NullExpectation.new }
-
-    it "blows up if method is absent" do
-      raw_request.delete 'method'
-      expect { described_class.from_hash(raw_request) }.to raise_error
-    end
-
-    it "blows up if path is absent" do
-      raw_request.delete 'path'
-      expect { described_class.from_hash(raw_request) }.to raise_error
-    end
-
-    it "does not blow up if body is missing" do
-      raw_request.delete 'body'
-      expect { described_class.from_hash(raw_request) }.to_not raise_error
-    end
-
-  end
-end
-
-module Pact
-
-  describe Request::Expected do
-    it_behaves_like "a request"
-
-    describe "as_json_with_options" do
-      subject { Request::Expected.new(:get, '/path', {:header => 'value'}, {:body => 'yeah'}, "query", options) }
-      context "with options" do
-        let(:options) { {some: 'options'} }
-        it "includes the options" do
-          expect(subject.as_json_with_options[:options]).to eq options
-        end
-      end
-      context "without options" do
-        let(:options) { {} }
-        it "does not include the options" do
-          expect(subject.as_json_with_options.key?(:options)).to be_false
+    describe "from_hash" do
+      context "when optional field are not defined" do
+        subject { described_class.from_hash(raw_request) }
+        it "sets their values to NullExpectation" do
+          expect(subject.body).to be_instance_of(Pact::NullExpectation)
+          expect(subject.query).to be_instance_of(Pact::NullExpectation)
+          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" 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
         end
       end
@@ -114,20 +42,20 @@ module Pact
 
       let(:expected_method) { 'get' }
       let(:expected_path) { '/foo' }
-      let(:expected_headers) { nil }
-      let(:expected_body) { nil }
+      let(:expected_headers) { Pact::NullExpectation.new }
+      let(:expected_body) { Pact::NullExpectation.new }
       let(:expected_query) { '' }
 
-      let(:actual_request) { Request::Actual.new(actual_method, actual_path, actual_headers, actual_body, actual_query) }
+      let(:actual_request) { Consumer::Request::Actual.new(actual_method, actual_path, actual_headers, actual_body, actual_query) }
 
       let(:actual_method) { 'get' }
       let(:actual_path) { '/foo' }
-      let(:actual_headers) { nil }
-      let(:actual_body) { nil }
+      let(:actual_headers) { {} }
+      let(:actual_body) { '' }
       let(:actual_query) { '' }
 
       it "matches identical requests" do
-        expect(subject.match 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
@@ -135,7 +63,7 @@ module Pact
         let(:actual_method) { 'get' }
 
         it "matches" do
-          expect(subject.match actual_request).to be_true
+          expect(subject.matches? actual_request).to be_true
         end
       end
 
@@ -144,7 +72,7 @@ module Pact
         let(:actual_method) { 'post' }
 
         it "does not match" do
-          expect(subject.match actual_request).to be_false
+          expect(subject.matches? actual_request).to be_false
         end
       end
 
@@ -153,7 +81,7 @@ module Pact
         let(:actual_path) { '/bar' }
 
         it "does not match" do
-          expect(subject.match actual_request).to be_false
+          expect(subject.matches? actual_request).to be_false
         end
       end
 
@@ -162,7 +90,7 @@ module Pact
         let(:actual_path) { '/foo/' }
 
         it "matches" do
-          expect(subject.match actual_request).to be_true
+          expect(subject.matches? actual_request).to be_true
         end
       end
 
@@ -171,16 +99,16 @@ module Pact
         let(:actual_body) { '' }
 
         it "does not match" do
-          expect(subject.match actual_request).to be_false
+          expect(subject.matches? actual_request).to be_false
         end
       end
 
       context "when the expected body has no expectation and the actual body is empty" do
-        let(:expected_body) { Request::NullExpectation.new }
+        let(:expected_body) { Pact::NullExpectation.new }
         let(:actual_body) { '' }
 
         it "matches" do
-          expect(subject.match actual_request).to be_true
+          expect(subject.matches? actual_request).to be_true
         end
       end
 
@@ -194,7 +122,7 @@ module Pact
         let(:actual_body) { nil }
 
         it "does not match" do
-          expect(subject.match actual_request).to be_false
+          expect(subject.matches? actual_request).to be_false
         end
       end
 
@@ -203,7 +131,7 @@ module Pact
         let(:actual_body) { 'bar' }
 
         it "does not match" do
-          expect(subject.match actual_request).to be_false
+          expect(subject.matches? actual_request).to be_false
         end
       end
 
@@ -223,7 +151,7 @@ module Pact
         end
 
         it "matches" do
-          expect(subject.match actual_request).to be_true
+          expect(subject.matches? actual_request).to be_true
         end
       end
 
@@ -243,7 +171,7 @@ module Pact
         end
 
         it "does not match" do
-          expect(subject.match actual_request).to be_false
+          expect(subject.matches? actual_request).to be_false
         end
       end
 
@@ -263,7 +191,7 @@ module Pact
         end
 
         it "matches" do
-          expect(subject.match actual_request).to be_true
+          expect(subject.matches? actual_request).to be_true
         end
       end
 
@@ -283,7 +211,7 @@ module Pact
         end
 
         it "does not match" do
-          expect(subject.match actual_request).to be_false
+          expect(subject.matches? actual_request).to be_false
         end
       end
 
@@ -303,7 +231,7 @@ module Pact
         end
 
         it "does not match" do
-          expect(subject.match 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
@@ -320,7 +248,7 @@ module Pact
           end
 
           it "does not match" do
-            expect(subject.match actual_request).to be_false
+            expect(subject.matches? actual_request).to be_false
           end
       end
 
@@ -340,7 +268,7 @@ module Pact
         end
 
         it "does not match" do
-          expect(subject.match actual_request).to be_true
+          expect(subject.matches? actual_request).to be_true
         end
       end
 
@@ -349,16 +277,16 @@ module Pact
         let(:actual_query) { 'bar' }
 
         it "does not match" do
-          expect(subject.match actual_request).to be_false
+          expect(subject.matches? actual_request).to be_false
         end
       end
 
       context 'when there is no query expectation' do
-        let(:expected_query) { Request::NullExpectation.new }
+        let(:expected_query) { Pact::NullExpectation.new }
         let(:actual_query) { 'bar' }
 
         it 'matches' do
-          expect(subject.match actual_request).to be_true
+          expect(subject.matches? actual_request).to be_true
         end
       end
 
@@ -367,7 +295,7 @@ module Pact
         let(:expected_body) { { thing: "123" } }
 
         it 'does not match' do
-          expect(subject.match actual_request).to be_false
+          expect(subject.matches? actual_request).to be_false
         end
       end
 
@@ -377,20 +305,16 @@ 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.match 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.match actual_request).to be_false
+            expect(subject.matches? actual_request).to be_false
           end
         end
       end
     end
   end
-
-  describe Request::Actual do
-    it_behaves_like "a request"
-  end
 end