webmock 1.7.10 → 1.8.0

data/lib/webmock/request_signature.rb

@@ -32,6 +32,7 @@ module WebMock
     def eql?(other)
       self.to_s == other.to_s
     end
+    alias == eql?
 
     def url_encoded?
       headers && headers['Content-Type'] == 'application/x-www-form-urlencoded'

data/lib/webmock/stub_registry.rb

@@ -4,30 +4,31 @@ module WebMock
     include Singleton
 
     attr_accessor :request_stubs
-    attr_accessor :global_stub
 
     def initialize
       reset!
     end
 
-    def reset!
-      self.request_stubs = global_stub ? [global_stub] : []
+    def global_stubs
+      @global_stubs ||= []
     end
 
-    def global_stub_block=(block)
-      self.global_stub = ::WebMock::RequestStub.new(:any, /.*/)
+    def reset!
+      self.request_stubs = []
+    end
 
+    def register_global_stub(&block)
       # This hash contains the responses returned by the block,
       # keyed by the exact request (using the object_id).
       # That way, there's no race condition in case #to_return
       # doesn't run immediately after stub.with.
       responses = {}
 
-      self.global_stub.with { |request|
+      stub = ::WebMock::RequestStub.new(:any, /.*/).with { |request|
         responses[request.object_id] = block.call(request)
       }.to_return(lambda { |request| responses.delete(request.object_id) })
 
-      register_request_stub(self.global_stub)
+      global_stubs.push stub
     end
 
     def register_request_stub(stub)
@@ -47,7 +48,7 @@ module WebMock
     private
 
     def request_stub_for(request_signature)
-      request_stubs.detect { |registered_request_stub|
+      (global_stubs + request_stubs).detect { |registered_request_stub|
         registered_request_stub.request_pattern.matches?(request_signature)
       }
     end

data/lib/webmock/version.rb

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

data/lib/webmock/webmock.rb

@@ -59,7 +59,10 @@ module WebMock
     end
     Config.instance.allow_net_connect ||
       (Config.instance.allow_localhost && WebMock::Util::URI.is_uri_localhost?(uri)) ||
-      Config.instance.allow && (Config.instance.allow.include?(uri.host) || Config.instance.allow.include?("#{uri.host}:#{uri.port}"))
+      Config.instance.allow && (
+        (Config.instance.allow.kind_of?(Regexp) && uri.to_s =~ Config.instance.allow) ||
+        (Config.instance.allow.respond_to?(:include?) &&
+         Config.instance.allow.include?(uri.host) || Config.instance.allow.include?("#{uri.host}:#{uri.port}")))
   end
 
   def self.reset!
@@ -89,7 +92,7 @@ module WebMock
   end
 
   def self.globally_stub_request(&block)
-    WebMock::StubRegistry.instance.global_stub_block = block
+    WebMock::StubRegistry.instance.register_global_stub(&block)
   end
 
   %w(

data/minitest/webmock_spec.rb

@@ -4,8 +4,8 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
     include HttpRequestTestHelper
 
     before do
-      stub_http_request(:any, "http://www.example.com")
-      stub_http_request(:any, "https://www.example.com")
+      @stub_http = stub_http_request(:any, "http://www.example.com")
+      @stub_https = stub_http_request(:any, "https://www.example.com")
     end
 
     it "should raise error on non stubbed request" do
@@ -18,6 +18,18 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
       assert_requested(:get, "http://www.example.com")
     end
 
+    it "should verify that expected http stub occured" do
+      http_request(:get, "http://www.example.com/")
+      assert_requested(@stub_http, :times => 1)
+      assert_requested(@stub_http)
+    end
+
+    it "should verify that expected https stub occured" do
+      http_request(:get, "https://www.example.com/")
+      http_request(:get, "https://www.example.com/")
+      assert_requested(@stub_https, :times => 2)
+    end
+
     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============================================================"
@@ -26,5 +38,13 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
      end
     end
 
+    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============================================================"
+     assert_fail(expected_message) do
+       assert_requested(@stub_http)
+     end
+    end
+
   end
 

data/spec/acceptance/curb/curb_spec_helper.rb

@@ -10,6 +10,16 @@ module CurbSpecHelper
     status, response_headers =
      WebMock::HttpLibAdapters::CurbAdapter.parse_header_string(curl.header_str)
 
+    # Deal with the fact that the HTTP spec allows multi-values headers
+    # to either be a single entry with a comma-separated listed of
+    # values, or multiple separate entries
+    response_headers.keys.each do |k|
+      v = response_headers[k]
+      if v.is_a?(Array)
+        response_headers[k] = v.join(', ')
+      end
+    end
+
     OpenStruct.new(
       :body => curl.body_str,
       :headers => WebMock::Util::Headers.normalize_headers(response_headers),
@@ -23,8 +33,8 @@ module CurbSpecHelper
     curl.url      = uri.omit(:userinfo).to_s
     curl.username = uri.user
     curl.password = uri.password
-    curl.timeout  = 10
-    curl.connect_timeout = 10
+    curl.timeout  = 30
+    curl.connect_timeout = 30
 
     if headers = options[:headers]
       headers.each {|k,v| curl.headers[k] = v }

data/spec/acceptance/em_http_request/em_http_request_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 require 'acceptance/webmock_shared'
 require 'ostruct'
@@ -8,7 +9,7 @@ unless RUBY_PLATFORM =~ /java/
   describe "EM::HttpRequest" do
     include EMHttpRequestSpecHelper
 
-    include_examples "with WebMock"
+    include_context "with WebMock", :no_status_message
 
     #functionality only supported for em-http-request 1.x
     if defined?(EventMachine::HttpConnection)
@@ -62,41 +63,43 @@ unless RUBY_PLATFORM =~ /java/
       end
 
       # not pretty, but it works
-      describe "with synchrony" do
-        let(:webmock_em_http) { File.expand_path(File.join(File.dirname(__FILE__), "../lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb")) }
-
-        before(:each) do
-          # need to reload the webmock em-http adapter after we require synchrony
-          WebMock::HttpLibAdapters::EmHttpRequestAdapter.disable!
-          $".delete webmock_em_http
-          $".delete File.expand_path(File.join(File.dirname(__FILE__), "../lib/webmock/http_lib_adapters/em_http_request_adapter.rb"))
-          require 'em-synchrony'
-          require 'em-synchrony/em-http'
-          require File.expand_path(File.join(File.dirname(__FILE__), "../lib/webmock/http_lib_adapters/em_http_request_adapter.rb"))
-        end
+      if defined?(EventMachine::Synchrony)
+        describe "with synchrony" do
+          let(:webmock_em_http) { File.expand_path(File.join(File.dirname(__FILE__), "../lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb")) }
+
+          before(:each) do
+            # need to reload the webmock em-http adapter after we require synchrony
+            WebMock::HttpLibAdapters::EmHttpRequestAdapter.disable!
+            $".delete webmock_em_http
+            $".delete File.expand_path(File.join(File.dirname(__FILE__), "../../../lib/webmock/http_lib_adapters/em_http_request_adapter.rb"))
+            require 'em-synchrony'
+            require 'em-synchrony/em-http'
+            require File.expand_path(File.join(File.dirname(__FILE__), "../../../lib/webmock/http_lib_adapters/em_http_request_adapter.rb"))
+          end
 
-        it "should work" do
-          stub_request(:post, /.*.testserver.com*/).to_return(:status => 200, :body => 'ok')
-          lambda {
-            EM.run do
-              fiber = Fiber.new do
-                http = EM::HttpRequest.new("http://www.testserver.com").post :body => "foo=bar&baz=bang", :timeout => 60
-                EM.stop
+          it "should work" do
+            stub_request(:post, /.*.testserver.com*/).to_return(:status => 200, :body => 'ok')
+            lambda {
+              EM.run do
+                fiber = Fiber.new do
+                  http = EM::HttpRequest.new("http://www.testserver.com").post :body => "foo=bar&baz=bang", :timeout => 60
+                  EM.stop
+                end
+                fiber.resume
               end
-              fiber.resume
-            end
-          }.should_not raise_error
-        end
+            }.should_not raise_error
+          end
 
-        after(:each) do
-          EM.send(:remove_const, :Synchrony)
-          EM.send(:remove_const, :HTTPMethods)
-          WebMock::HttpLibAdapters::EmHttpRequestAdapter.disable!
-          $".reject! {|path| path.include? "em-http-request"}
-          $".delete webmock_em_http
-          $".delete File.expand_path(File.join(File.dirname(__FILE__), "../lib/webmock/http_lib_adapters/em_http_request_adapter.rb"))
-          require 'em-http-request'
-          require File.expand_path(File.join(File.dirname(__FILE__), "../lib/webmock/http_lib_adapters/em_http_request_adapter.rb"))
+          after(:each) do
+            EM.send(:remove_const, :Synchrony)
+            EM.send(:remove_const, :HTTPMethods)
+            WebMock::HttpLibAdapters::EmHttpRequestAdapter.disable!
+            $".reject! {|path| path.include? "em-http-request"}
+            $".delete webmock_em_http
+            $".delete File.expand_path(File.join(File.dirname(__FILE__), "../../../lib/webmock/http_lib_adapters/em_http_request_adapter.rb"))
+            require 'em-http-request'
+            require File.expand_path(File.join(File.dirname(__FILE__), "../../../lib/webmock/http_lib_adapters/em_http_request_adapter.rb"))
+          end
         end
       end
     end
@@ -131,6 +134,12 @@ unless RUBY_PLATFORM =~ /java/
       http_request(:post, "http://www.example.com", :body => {:a => "1", :b => "2"}).body.should == "ok"
     end
 
+    it "should work with UTF-8 strings" do
+      body = "Привет, Мир!"
+      stub_request(:post, "www.example.com").to_return(:body => body)
+      http_request(:post, "http://www.example.com").body.bytesize.should == body.bytesize
+    end
+
     describe "mocking EM::HttpClient API" do
       before do
         stub_request(:get, "www.example.com/")

data/spec/acceptance/em_http_request/em_http_request_spec_helper.rb

@@ -10,16 +10,18 @@ module EMHttpRequestSpecHelper
     head = options[:headers] || {}
     response = nil
     error = nil
+    error_set = false
     uri = Addressable::URI.heuristic_parse(uri)
     EventMachine.run {
       request = EventMachine::HttpRequest.new("#{uri.normalize.to_s}")
       http = request.send(method, {
-        :timeout => 10,
+        :timeout => 30,
         :body => options[:body],
         :query => options[:query],
         :head => head.merge('authorization' => [uri.user, uri.password])
       }, &block)
       http.errback {
+        error_set = true
         error = if http.respond_to?(:errors)
           http.errors
         else
@@ -38,7 +40,7 @@ module EMHttpRequestSpecHelper
       }
       @http = http
     }
-    raise error if error
+    raise error.to_s if error_set
     response
   end
 

data/spec/acceptance/excon/excon_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'acceptance/webmock_shared'
+require 'acceptance/excon/excon_spec_helper'
+
+describe "Excon" do
+  include ExconSpecHelper
+  include_context "with WebMock", :no_status_message, :no_url_auth
+
+  it 'should allow Excon requests to use query hash paramters' do
+    stub_request(:get, "http://example.com/resource/?a=1&b=2").to_return(:body => "abc")
+    Excon.get('http://example.com', :path => "resource/", :query => {:a => 1, :b => 2}).body.should == "abc"
+  end
+
+end
+

data/spec/acceptance/excon/excon_spec_helper.rb

@@ -0,0 +1,37 @@
+require 'ostruct'
+
+module ExconSpecHelper
+
+  def http_request(method, uri, options = {}, &block)
+    uri      = Addressable::URI.heuristic_parse(uri)
+    uri      = uri.omit(:userinfo).to_s.gsub(' ', '+')
+
+    options  = options.merge(:method => method) # Dup and merge
+    response = Excon.new(uri).request(options, &block)
+
+    headers  = WebMock::Util::Headers.normalize_headers(response.headers)
+    headers  = headers.inject({}) do |res, (name, value)|
+      res[name] = value.is_a?(Array) ? value.flatten.join(', ') : value
+      res
+    end
+
+    OpenStruct.new \
+      :body => response.body,
+      :headers => headers,
+      :status  => response.status.to_s,
+      :message => ""
+  end
+
+  def client_timeout_exception_class
+    Excon::Errors::Timeout
+  end
+
+  def connection_refused_exception_class
+    Excon::Errors::SocketError
+  end
+
+  def http_library
+    :excon
+  end
+
+end

data/spec/acceptance/net_http/net_http_spec.rb

@@ -184,7 +184,14 @@ describe "Net:HTTP" do
           cert.should be_a(OpenSSL::X509::Certificate)
         }
       end
+
+      it "should connect to the server if the URI matches an regex", :net_connect => true do
+        WebMock.disable_net_connect!(:allow => /google.com/)
+        response = Net::HTTP.get('www.google.com','/')
+      end
+
     end
+
   end
 
   describe "when net_http_connect_on_start is true" do

data/spec/acceptance/net_http/net_http_spec_helper.rb

@@ -23,7 +23,9 @@ module NetHTTPSpecHelper
     if uri.scheme == "https"
       http.use_ssl = true
       #1.9.1 has a bug with ssl_timeout
-      http.ssl_timeout = 10 unless RUBY_VERSION == "1.9.1"
+      http.ssl_timeout = 20 unless RUBY_VERSION == "1.9.1"
+      http.open_timeout = 60
+      http.read_timeout = 60
     end
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     response = http.start {|http|

data/spec/acceptance/patron/patron_spec.rb

@@ -96,7 +96,14 @@ unless RUBY_PLATFORM =~ /java/
             Encoding.default_internal = @encoding
           end
 
-          it "should encode body based on charset in headers" do
+          it "should encode body with default encoding" do
+            stub_request(:get, "www.example.com").
+              to_return(:body => "Øl")
+
+            @sess.get("").body.encoding.should == Encoding::UTF_8
+          end
+
+          it "should encode body to default internal" do
             stub_request(:get, "www.example.com").
               to_return(:headers => {'Content-Type' => 'text/html; charset=iso-8859-1'},
                         :body => "Øl".encode("iso-8859-1"))
@@ -109,17 +116,19 @@ unless RUBY_PLATFORM =~ /java/
               to_return(:body => "<?xml encoding=\"iso-8859-1\">Øl</xml>".encode("iso-8859-1"))
 
 
-            @sess.get("").body.encoding.should == Encoding.default_internal
+            @sess.get("").body.encoding.should == Encoding::ISO_8859_1
           end
 
+
           it "should encode body based on Session#default_response_charset" do
             stub_request(:get, "www.example.com").
               to_return(:body => "Øl".encode("iso-8859-1"))
 
             @sess.default_response_charset = "iso-8859-1"
 
-            @sess.get("").body.encoding.should == Encoding.default_internal
+            @sess.get("").body.encoding.should == Encoding::ISO_8859_1
           end
+
         end
       end
     end

data/spec/acceptance/patron/patron_spec_helper.rb

@@ -8,8 +8,8 @@ module PatronSpecHelper
     sess.username = uri.user
     sess.password = uri.password
 
-    sess.connect_timeout = 10
-    sess.timeout = 10
+    sess.connect_timeout = 30
+    sess.timeout = 30
     sess.max_redirects = 0
     uri = "#{uri.path}#{uri.query ? '?' : ''}#{uri.query}"
     uri.gsub!(' ','+')

data/spec/acceptance/shared/allowing_and_disabling_net_connect.rb

@@ -1,4 +1,4 @@
-shared_context "allowing and disabling net connect" do
+shared_context "allowing and disabling net connect" do |*adapter_info|
   describe "when net connect" do
     describe "is allowed", :net_connect => true do
       before(:each) do
@@ -11,8 +11,8 @@ shared_context "allowing and disabling net connect" do
 
       it "should make a real https request if request is not stubbed" do
         unless http_library == :httpclient
-          http_request(:get, "https://www.paypal.com/uk/cgi-bin/webscr").
-            body.should =~ /.*paypal.*/
+          http_request(:get, "https://www.google.com/").
+            body.should =~ /.*google.*/
         end
       end
 

data/spec/acceptance/shared/callbacks.rb

@@ -1,4 +1,4 @@
-shared_context "callbacks" do
+shared_context "callbacks" do |*adapter_info|
   describe "when after_request callback is declared" do
     before(:each) do
       WebMock.reset_callbacks
@@ -44,6 +44,25 @@ shared_context "callbacks" do
       @request_signature.uri.to_s.should == "http://www.example.com:80/"
     end
 
+    after(:each) do
+      WebMock::StubRegistry.instance.global_stubs.clear
+    end
+
+    it 'passes the same request signature instance to the callback that was passed to the global stub callback' do
+      global_stub_request_sig = after_request_request_sig = nil
+      WebMock.globally_stub_request do |request_sig|
+        global_stub_request_sig = request_sig
+        nil
+      end
+
+      WebMock.after_request do |request_sig, _|
+        after_request_request_sig = request_sig
+      end
+
+      http_request(:get, "http://www.example.com/")
+      global_stub_request_sig.should be(after_request_request_sig)
+    end
+
     context "passing response to callback" do
       context "when request is stubbed" do
         before(:each) do
@@ -86,11 +105,8 @@ shared_context "callbacks" do
         end
 
         it "should pass real response to callback with status and message" do
-          # not supported by em-http-request, it always returns "unknown" for http_reason
-          unless http_library == :em_http_request
-            @response.status[0].should == 302
-            @response.status[1].should == "Found"
-          end
+          @response.status[0].should == 302
+          @response.status[1].should == "Found" unless adapter_info.include?(:no_status_message)
         end
 
         it "should pass real response to callback with headers" do