pact-support 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96c37218ffea4538adf60f7a93d1c494723d14c1
-  data.tar.gz: a54ca9babda872a3aec4412e2d3f2456dc915d72
+  metadata.gz: df14a80c6fb9e36924a13bdf658aaae7f244183f
+  data.tar.gz: c84bef17499b45fb3a1ba67fcf4152dc81a2ef63
 SHA512:
-  metadata.gz: f92a57c9ab90f83c059d23a17434dc4e9cb96424a9ef50953a750ec38bd994adc716b05b7495c76dc1ce1cb9e044ecae5e91517296d400d620b2bcb6eb2598a7
-  data.tar.gz: 0740b78cb0f67a31ef808efcd85e7c00274928247ae1dfa4d7becb401860eeb2c3d8757697de6213258b032770a3771b3f12a59fbfeba90007d50da88eb5ae4e
+  metadata.gz: 2dc586e4103e8596c17e370b8a3c384745c92abfb5a64f39413b5a0a43fce9324ddd1d3591c8bd87d4a6914f67a492c50382aac952180f8bb0d0ba21bdee5972
+  data.tar.gz: 6acab79c481d452bca05ae0d90a30b353efac77ef529154630bb3779aa3817fa2829be944bbfaf7bc13d0b2ad4f9dbc95d58f3c79934058d66ac30a4285c019f

data/.gitignore

@@ -27,3 +27,4 @@ spec/pacts
 log
 .idea
 reports
+Gemfile.lock

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 0.1.1 (22 October 2014)
+
+* ff6a01d - Disallowing unexpected params in the query (bethesque, Wed Oct 22 14:42:41 2014 +1100)
+
 ### 0.1.0 (22 October 2014)
 
 * fa7e03f - Removed JSON serialisation code from models. It has been moved to decorators in pact_mock-service. (bethesque, Wed Oct 22 12:53:21 2014 +1100)

data/lib/pact/consumer_contract/query_hash.rb

@@ -14,7 +14,7 @@ module Pact
     end
 
     def convert_to_hash_of_arrays query
-      symbolize_keys(query).inject({}) {|h,(k,v)|  h[k] = v.is_a?(Array) ? v : [v] ; h }
+      symbolize_keys(query).each_with_object({}) {|(k,v), hash| hash[k] = [*v] }
     end
 
     def as_json opts = {}
@@ -36,7 +36,7 @@ module Pact
     # other will always be a QueryString, not a QueryHash, as it will have ben created
     # from the actual query string.
     def difference(other)
-      diff(query, symbolize_keys(CGI::parse(other.query)))
+      diff(query, symbolize_keys(CGI::parse(other.query)), allow_unexpected_keys: false)
     end
 
     def query
@@ -52,4 +52,4 @@ module Pact
     end
 
   end
-end
+end

data/lib/pact/shared/request.rb

@@ -43,10 +43,14 @@ module Pact
       end
 
       def content_type
-        return nil if headers.is_a? self.class.key_not_found.class
+        return nil unless specified?(:headers)
         headers['Content-Type']
       end
 
+      def content_type? content_type
+        self.content_type == content_type
+      end
+
       def modifies_resource?
         http_method_modifies_resource? && body_specified?
       end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

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

@@ -0,0 +1,92 @@
+require 'pact/consumer_contract/query_hash'
+require 'pact/consumer_contract/query_string'
+
+module Pact
+  describe QueryHash do
+
+    subject { QueryHash.new(query) }
+
+    let(:query) { { param: 'thing' } }
+    let(:query_with_array) { { param: ['thing'] } }
+
+    describe "difference" do
+      context "when the other is the same" do
+
+        let(:other) { QueryString.new('param=thing') }
+
+        it 'returns an empty diff' do
+          expect(subject.difference(other)).to be_empty
+        end
+      end
+
+      context "when the other is different" do
+        let(:other) { QueryString.new('param=thing1') }
+
+        it 'returns the diff' do
+          expect(subject.difference(other)).to_not be_empty
+        end
+      end
+
+      context "when the other has an extra param" do
+        let(:other) { QueryString.new('param=thing&param2=blah') }
+
+        it 'returns the diff' do
+          expect(subject.difference(other)).to_not be_empty
+        end
+      end
+    end
+
+    describe "#as_json" do
+      it "returns the query as a Hash" do
+        expect(subject.as_json).to eq query_with_array
+      end
+    end
+
+    describe "#to_json" do
+      context "when the query contains a Pact::Term" do
+        let(:term) { Pact::Term.new(generate: "thing", matcher: /th/) }
+        let(:query) { { param: term } }
+        let(:query_with_array) { { param: [term] } }
+
+        it "serialises the Pact::Term as Ruby specific JSON" do
+          expect(subject.to_json).to eq query_with_array.to_json
+        end
+      end
+    end
+
+    describe "#==" do
+      context "when the query is not an identical match" do
+        let(:other) { QueryHash.new(param: 'other thing')}
+        it "returns false" do
+          expect(subject == other).to be false
+        end
+      end
+
+      context "when the query is an identical match" do
+        let(:other) { QueryHash.new(query) }
+        it "returns true" do
+          expect(subject == other).to be true
+        end
+      end
+    end
+
+    describe "#to_s" do
+      it "returns the query Hash as a string" do
+        expect(subject.to_s).to eq query_with_array.to_s
+      end
+    end
+
+    describe "#as_json" do
+      it "returns the query Hash" do
+        expect(subject.as_json).to eq query_with_array
+      end
+    end
+
+    describe "#to_json" do
+      it "returns the query Hash as JSON" do
+        expect(subject.to_json).to eq query_with_array.to_json
+      end
+    end
+
+  end
+end

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

@@ -87,6 +87,7 @@ module Pact
       describe "#content_type" do
 
         subject { TestRequest.new("get", "/something", headers, {} , "") }
+
         context "when there are no expected headers" do
           let(:headers) { Pact::KeyNotFound.new }
           it "returns nil" do
@@ -107,6 +108,23 @@ module Pact
         end
       end
 
+      describe "content_type?" do
+        subject { TestRequest.new("get", "/something", headers, {} , "") }
+        let(:headers) { {'content-type' => 'blah'} }
+
+        context "when the content type is the same" do
+          it "returns true" do
+            expect(subject.content_type?('blah')).to be true
+          end
+        end
+        context "when the content type is not the same" do
+          it "returns false" do
+            expect(subject.content_type?('apple')).to be false
+          end
+        end
+
+      end
+
       describe "modifies_resource?" do
 
         subject { Pact::Request::Expected.from_hash(request).modifies_resource? }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Fraser
@@ -226,7 +226,6 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -287,6 +286,7 @@ files:
 - spec/lib/pact/consumer_contract/consumer_contract_spec.rb
 - spec/lib/pact/consumer_contract/headers_spec.rb
 - spec/lib/pact/consumer_contract/interaction_spec.rb
+- spec/lib/pact/consumer_contract/query_hash_spec.rb
 - spec/lib/pact/consumer_contract/query_string_spec.rb
 - spec/lib/pact/consumer_contract/request_spec.rb
 - spec/lib/pact/consumer_contract/response_spec.rb
@@ -364,6 +364,7 @@ test_files:
 - spec/lib/pact/consumer_contract/consumer_contract_spec.rb
 - spec/lib/pact/consumer_contract/headers_spec.rb
 - spec/lib/pact/consumer_contract/interaction_spec.rb
+- spec/lib/pact/consumer_contract/query_hash_spec.rb
 - spec/lib/pact/consumer_contract/query_string_spec.rb
 - spec/lib/pact/consumer_contract/request_spec.rb
 - spec/lib/pact/consumer_contract/response_spec.rb

data/Gemfile.lock

@@ -1,80 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pact-support (0.1.0)
-      awesome_print (~> 1.1)
-      find_a_port (~> 1.0.1)
-      json
-      rack-test (~> 0.6.2)
-      randexp (~> 0.1.7)
-      rspec (>= 2.14)
-      term-ansicolor (~> 1.0)
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.1.1)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    awesome_print (1.2.0)
-    coderay (1.1.0)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
-    fakefs (0.5.2)
-    find_a_port (1.0.1)
-    hashie (2.1.1)
-    i18n (0.6.9)
-    json (1.8.1)
-    method_source (0.8.2)
-    minitest (5.3.4)
-    pry (0.10.0)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (10.0.4)
-    randexp (0.1.7)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    safe_yaml (1.0.3)
-    slop (3.5.0)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tins (1.3.3)
-    tzinfo (1.2.1)
-      thread_safe (~> 0.1)
-    webmock (1.18.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  fakefs (~> 0.4)
-  hashie (~> 2.0)
-  pact-support!
-  pry
-  rake (~> 10.0.3)
-  webmock (~> 1.18.0)