webmock 3.0.1 → 3.1.0

data/lib/webmock/stub_request_snippet.rb

@@ -10,10 +10,10 @@ module WebMock
 
     def to_s(with_response = true)
       request_pattern = @request_stub.request_pattern
-      string = "stub_request(:#{request_pattern.method_pattern.to_s},"
+      string = "stub_request(:#{request_pattern.method_pattern.to_s},".dup
       string << " \"#{request_pattern.uri_pattern.to_s}\")"
 
-      with = ""
+      with = "".dup
 
       if (request_pattern.body_pattern)
         with << "body: #{request_pattern.body_pattern.to_s}"

data/lib/webmock/util/headers.rb

@@ -12,7 +12,7 @@ module WebMock
           [name.to_s.split(/_|-/).map { |segment| segment.capitalize }.join("-"),
            case value
             when Regexp then value
-            when Array then (value.size == 1) ? value.first : value.map {|v| v.to_s}.sort
+            when Array then (value.size == 1) ? value.first.to_s : value.map {|v| v.to_s}.sort
             else value.to_s
            end
           ]
@@ -22,7 +22,7 @@ module WebMock
 
       def self.sorted_headers_string(headers)
         headers = WebMock::Util::Headers.normalize_headers(headers)
-        str = '{'
+        str = '{'.dup
         str << headers.map do |k,v|
           v = case v
             when Regexp then v.inspect

data/lib/webmock/util/query_mapper.rb

@@ -204,7 +204,7 @@ module WebMock::Util
           end
         end
 
-        buffer = ''
+        buffer = ''.dup
         new_query_values.each do |parent, value|
           encoded_parent = ::Addressable::URI.encode_component(
               parent.dup, ::Addressable::URI::CharacterClasses::UNRESERVED
@@ -251,14 +251,14 @@ module WebMock::Util
             ]
           end
           value.sort!
-          buffer = ''
+          buffer = ''.dup
           value.each do |key, val|
             new_parent = options[:notation] != :flat_array ? "#{parent}[#{key}]" : parent
             buffer << "#{to_query(new_parent, val, options)}&"
           end
           buffer.chop
         when ::Array
-          buffer = ''
+          buffer = ''.dup
           value.each_with_index do |val, i|
             new_parent = options[:notation] != :flat_array ? "#{parent}[#{i}]" : parent
             buffer << "#{to_query(new_parent, val, options)}&"

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '3.0.1' unless defined?(::WebMock::VERSION)
+  VERSION = '3.1.0' unless defined?(::WebMock::VERSION)
 end

data/minitest/webmock_spec.rb

@@ -43,7 +43,7 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
     it  "should verify that expect request didn't occur" do
      expected_message = "The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times"
-     expected_message << "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
+     expected_message += "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
      assert_fail(expected_message) do
        assert_requested(:get, "http://www.example.com")
      end
@@ -51,7 +51,7 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
     it  "should verify that expect stub didn't occur" do
      expected_message = "The request ANY http://www.example.com/ was expected to execute 1 time but it executed 0 times"
-     expected_message << "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
+     expected_message += "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
      assert_fail(expected_message) do
        assert_requested(@stub_http)
      end

data/spec/acceptance/http_rb/http_rb_spec.rb

@@ -70,4 +70,13 @@ describe "HTTP.rb" do
       expect(response.uri.to_s).to eq "http://example.com/foo"
     end
   end
+
+  context "streamer" do
+    it "can be closed" do
+      stub_request :get, "example.com/foo"
+      response = HTTP.get "http://example.com/foo"
+
+      response.connection.close
+    end
+  end
 end

data/spec/acceptance/http_rb/http_rb_spec_helper.rb

@@ -20,7 +20,7 @@ module HttpRbSpecHelper
 
   def client_timeout_exception_class
     return Errno::ETIMEDOUT if HTTP::VERSION < "1.0.0"
-    HTTP::ConnectionError
+    HTTP::TimeoutError
   end
 
   def connection_refused_exception_class

data/spec/acceptance/httpclient/httpclient_spec.rb

@@ -31,6 +31,13 @@ describe "HTTPClient" do
     expect(response_body).to eq("abc")
   end
 
+  it "should not yield block on empty response if block provided" do
+    stub_request(:get, "www.example.com").to_return(body: "")
+    response_body = ""
+    http_request(:get, "http://www.example.com/"){ raise }
+    expect(response_body).to eq("")
+  end
+
   it "should match requests if headers are the same  but in different order" do
     stub_request(:get, "www.example.com").with(headers: {"a" => ["b", "c"]} )
     expect(http_request(
@@ -48,7 +55,7 @@ describe "HTTPClient" do
 
   it "should work with get_content" do
     stub_request(:get, 'www.example.com').to_return(status: 200, body: 'test', headers: {})
-    str = ''
+    str = ''.dup
     HTTPClient.get_content('www.example.com') do |content|
       str << content
     end

data/spec/acceptance/net_http/net_http_shared.rb

@@ -12,7 +12,7 @@ shared_examples_for "Net::HTTP" do
     end
 
     it "should handle requests with block passed to read_body", net_connect: true do
-      body = ""
+      body = "".dup
       req = Net::HTTP::Get.new("/")
       Net::HTTP.start("localhost", port) do |http|
         http.request(req) do |res|

data/spec/acceptance/net_http/net_http_spec.rb

@@ -293,7 +293,7 @@ describe "Net:HTTP" do
     end
 
     it "should support the after_request callback on an request with block and read_body" do
-      response_body = ''
+      response_body = ''.dup
       http_request(:get, "http://localhost:#{port}/") do |response|
         response.read_body { |fragment| response_body << fragment }
       end
@@ -314,4 +314,18 @@ describe "Net:HTTP" do
       expect(@callback_invocation_count).to eq(1)
     end
   end
+
+  it "should match http headers, even if their values have been set in a request as numbers" do
+    WebMock.disable_net_connect!
+
+    stub_request(:post, "www.example.com").with(headers: {"My-Header" => 99})
+
+    uri = URI.parse('http://www.example.com/')
+    req = Net::HTTP::Post.new(uri.path)
+    req['My-Header'] = 99
+
+    res = Net::HTTP.start(uri.host, uri.port) do |http|
+      http.request(req, '')
+    end
+  end
 end

data/spec/acceptance/patron/patron_spec_helper.rb

@@ -16,7 +16,7 @@ module PatronSpecHelper
     sess.timeout = 30
     sess.max_redirects = 0
     uri = "#{uri.path}#{uri.query ? '?' : ''}#{uri.query}"
-    uri.gsub!(' ','%20')
+    uri = uri.gsub(' ','%20')
     response = sess.request(method, uri, options[:headers] || {}, {
       data: options[:body]
     })

data/spec/acceptance/shared/request_expectations.rb

@@ -165,6 +165,13 @@ shared_context "request expectations" do |*adapter_info|
             expect(a_request(:get, "www.example.com").with(query: hash_including({"a" => ["b", "c"]}))).to have_been_made
           }.not_to raise_error
         end
+
+        it 'should satisfy expectation if the request was executed with excluding part of query params declared as a hash in a query option' do
+          expect {
+            http_request(:get, "http://www.example.com/?a[]=d&b[]=e&b=1")
+            expect(a_request(:get, "www.example.com").with(query: hash_excluding(a: ['b', 'c']))).to have_been_made
+          }.not_to raise_error
+        end
       end
 
       context "when using flat array notation" do

data/spec/acceptance/shared/stubbing_requests.rb

@@ -63,6 +63,11 @@ shared_examples_for "stubbing requests" do |*adapter_info|
         stub_request(:get, "www.example.com").with(query: hash_including({"a" => ["b", "c"]})).to_return(body: "abc")
         expect(http_request(:get, "http://www.example.com/?a[]=b&a[]=c&b=1").body).to eq("abc")
       end
+
+      it 'should return stubbed response when stub expects exclude part of query params' do
+        stub_request(:get, 'www.example.com').with(query: hash_excluding(a: ['b', 'c'])).to_return(body: 'abc')
+        expect(http_request(:get, 'http://www.example.com/?a[]=c&a[]=d&b=1').body).to eq('abc')
+      end
     end
 
     describe "based on method" do

data/spec/acceptance/typhoeus/typhoeus_hydra_spec.rb

@@ -127,7 +127,7 @@ unless RUBY_PLATFORM =~ /java/
           end
           hydra.queue @request
           hydra.run
-          expect(test_headers).to include('X-Test' => '1')
+          expect(test_headers.to_h).to include('X-Test' => '1')
         end
       end
     end

data/spec/acceptance/typhoeus/typhoeus_hydra_spec_helper.rb

@@ -6,7 +6,7 @@ module TyphoeusHydraSpecHelper
 
 
   def http_request(method, uri, options = {}, &block)
-    uri.gsub!(" ", "%20") #typhoeus doesn't like spaces in the uri
+    uri = uri.gsub(" ", "%20") #typhoeus doesn't like spaces in the uri
     request_options =  {
       method: method,
       body: options[:body],

data/spec/unit/api_spec.rb

@@ -2,9 +2,8 @@ require 'spec_helper'
 
 describe WebMock::API do
   describe '#hash_including' do
-
     subject { klass.new.hash_including(args) }
-    let(:args) { {data: :one} }
+    let(:args) { { data: :one } }
 
     context 'when mixed into a class that does not define `hash_including`' do
       let(:klass) do
@@ -54,7 +53,7 @@ describe WebMock::API do
 
 
     context 'when mixed into a class with a parent that defines `hash_including`' do
-      subject {klass.new.hash_including(*args)}
+      subject { klass.new.hash_including(*args) }
       let(:args) { %w(:foo, :bar, {:data => :one}) }
       let(:klass) do
         Class.new(
@@ -70,6 +69,88 @@ describe WebMock::API do
         expect(subject).to eq(args)
       end
     end
+  end
+
+  describe '#hash_excluding' do
+    subject { klass.new.hash_excluding(args) }
+    let(:args) { { data: :one } }
+
+    context 'when mixed into a class that does not define `hash_including`' do
+      let(:klass) do
+        Class.new do
+          include WebMock::API
+        end
+      end
+
+      it 'uses WebMock::Matchers::HashIncludingMatcher' do
+        expect(subject).to be_a(WebMock::Matchers::HashExcludingMatcher)
+      end
+
+      #  by testing equality for HashIncludingMatcher (which stringifies the passed hash) we are
+      #  testing HashIncludingMatcher.initialize behavior as well
+      context 'when args correspond to an hash' do
+        context 'creates "HashExcludingMatcher"' do
+          it 'equals hash with similar key but different value' do
+            expect(subject).to eq('data' => :two)
+          end
+
+          it 'equals hash with similar value but different key' do
+            expect(subject).to eq('data2' => :one)
+          end
+
+          it 'equals hash with defferent value and key' do
+            expect(subject).to eq('data2' => :two)
+          end
 
+          it 'not equals with similar value and key' do
+            expect(subject).not_to eq('data' => :one)
+          end
+        end
+      end
+
+      context 'when args are one or many keys' do
+        subject { klass.new.hash_excluding(:foo, :bar) }
+        let(:anything) { WebMock::Matchers::AnyArgMatcher.new(nil) }
+
+        it "creates 'HashExcludingMatcher' with keys anythingized" do
+          expect(subject).not_to eq('foo' => anything, 'bar' => anything )
+        end
+      end
+
+      context 'when args are both keys and key/value pairs' do
+        subject { klass.new.hash_excluding(:foo, :bar, data: :one) }
+        let(:anything) { WebMock::Matchers::AnyArgMatcher.new(nil) }
+
+        it 'creates "HashExcludingMatcher" with keys anythingized' do
+          expect(subject).not_to eq('foo' => anything, 'bar' => anything, 'data' => :one)
+        end
+      end
+
+      context 'when args are an empty hash' do
+        subject { klass.new.hash_excluding({}) }
+
+        it 'creates "HashExcludingMatcher" with an empty hash' do
+          expect(subject).to eq({})
+        end
+      end
+    end
+
+    context 'when mixed into a class with a parent that defines `hash_excluding`' do
+      subject { klass.new.hash_excluding(*args) }
+      let(:args) { %w(:foo, :bar, {:data => :one}) }
+      let(:klass) do
+        Class.new(
+          Class.new do
+            def hash_excluding(*args)
+              args
+            end
+          end
+        ) { include WebMock::API }
+      end
+
+      it 'uses super and passes the args untampered' do
+        expect(subject).to eq(args)
+      end
+    end
   end
 end

data/spec/unit/matchers/hash_excluding_matcher_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+module WebMock
+  module Matchers
+    describe HashExcludingMatcher do
+      it 'stringifies the given hash keys' do
+        expect(HashExcludingMatcher.new(a: 1, b: 2)).not_to eq('a' => 1, 'b' => 2)
+      end
+
+      it 'sorts elements in the hash' do
+        expect(HashExcludingMatcher.new(b: 2, a: 1)).not_to eq('a' => 1, 'b' => 2)
+      end
+
+      it 'describes itself properly' do
+        expect(HashExcludingMatcher.new(a: 1).inspect).to eq 'hash_excluding({"a"=>1})'
+      end
+
+      describe 'success' do
+        it 'match with hash with a missing key' do
+          expect(HashExcludingMatcher.new(a: 1)).to eq('b' => 2)
+        end
+
+        it 'match an empty hash with a given key' do
+          expect(HashExcludingMatcher.new(a: 1)).to eq({})
+        end
+
+        it 'match when values are nil but keys are different' do
+          expect(HashExcludingMatcher.new(a: nil)).to eq('b' => nil)
+        end
+
+        describe 'when matching an empty hash' do
+          it 'does not matches against any hash' do
+            expect(HashExcludingMatcher.new({})).to eq(a: 1, b: 2, c: 3)
+          end
+        end
+      end
+
+      describe 'failing' do
+        it 'does not match a hash with a one missing key when one pair is matching' do
+          expect(HashExcludingMatcher.new(a: 1, b: 2)).not_to eq('b' => 2)
+        end
+
+        it 'match a hash with an incorrect value' do
+          expect(HashExcludingMatcher.new(a: 1, b: 2)).not_to eq('a' => 1, 'b' => 3)
+        end
+
+        it 'does not matches the same hash' do
+          expect(HashExcludingMatcher.new('a' => 1, 'b' => 2)).not_to eq('a' => 1, 'b' => 2)
+        end
+
+        it 'does not matches a hash with extra stuff' do
+          expect(HashExcludingMatcher.new(a: 1)).not_to eq('a' => 1, 'b' => 2)
+        end
+
+        it 'does not match a non-hash' do
+          expect(HashExcludingMatcher.new(a: 1)).not_to eq 1
+        end
+      end
+    end
+  end
+end

data/spec/unit/request_execution_verifier_spec.rb

@@ -53,7 +53,7 @@ describe WebMock::RequestExecutionVerifier do
       @verifier.times_executed = 0
       @verifier.expected_times_executed = 2
       expected_text = "The request www.example.com was expected to execute 2 times but it executed 0 times"
-      expected_text << @executed_requests_info
+      expected_text += @executed_requests_info
       expect(@verifier.failure_message).to eq(expected_text)
     end
 
@@ -61,7 +61,7 @@ describe WebMock::RequestExecutionVerifier do
       @verifier.times_executed = 1
       @verifier.expected_times_executed = 1
       expected_text = "The request www.example.com was expected to execute 1 time but it executed 1 time"
-      expected_text << @executed_requests_info
+      expected_text += @executed_requests_info
       expect(@verifier.failure_message).to eq(expected_text)
     end
 
@@ -70,7 +70,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 1
         @verifier.at_least_times_executed = 2
         expected_text = "The request www.example.com was expected to execute at least 2 times but it executed 1 time"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message).to eq(expected_text)
       end
 
@@ -78,7 +78,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 2
         @verifier.at_least_times_executed = 3
         expected_text = "The request www.example.com was expected to execute at least 3 times but it executed 2 times"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message).to eq(expected_text)
       end
     end
@@ -88,7 +88,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 3
         @verifier.at_most_times_executed = 2
         expected_text = "The request www.example.com was expected to execute at most 2 times but it executed 3 times"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message).to eq(expected_text)
       end
 
@@ -96,7 +96,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 2
         @verifier.at_most_times_executed = 1
         expected_text = "The request www.example.com was expected to execute at most 1 time but it executed 2 times"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message).to eq(expected_text)
       end
     end
@@ -108,14 +108,14 @@ describe WebMock::RequestExecutionVerifier do
       @verifier.times_executed = 2
       @verifier.expected_times_executed = 2
       expected_text = "The request www.example.com was not expected to execute 2 times but it executed 2 times"
-      expected_text << @executed_requests_info
+      expected_text += @executed_requests_info
       expect(@verifier.failure_message_when_negated).to eq(expected_text)
     end
 
     it "reports failure message when not expected request but it executed" do
       @verifier.times_executed = 1
       expected_text = "The request www.example.com was not expected to execute but it executed 1 time"
-      expected_text << @executed_requests_info
+      expected_text += @executed_requests_info
       expect(@verifier.failure_message_when_negated).to eq(expected_text)
     end
 
@@ -124,7 +124,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 3
         @verifier.at_least_times_executed = 2
         expected_text = "The request www.example.com was not expected to execute at least 2 times but it executed 3 times"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message_when_negated).to eq(expected_text)
       end
 
@@ -132,7 +132,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 2
         @verifier.at_least_times_executed = 2
         expected_text = "The request www.example.com was not expected to execute at least 2 times but it executed 2 times"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message_when_negated).to eq(expected_text)
       end
     end
@@ -142,7 +142,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 2
         @verifier.at_most_times_executed = 3
         expected_text = "The request www.example.com was not expected to execute at most 3 times but it executed 2 times"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message_when_negated).to eq(expected_text)
       end
 
@@ -150,7 +150,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 1
         @verifier.at_most_times_executed = 2
         expected_text = "The request www.example.com was not expected to execute at most 2 times but it executed 1 time"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message_when_negated).to eq(expected_text)
       end
     end