faraday 0.8.11 → 0.9.0

data/test/adapters/integration.rb

@@ -1,5 +1,6 @@
 require 'forwardable'
 require File.expand_path("../../helper", __FILE__)
+Faraday.require_lib 'autoload'
 
 module Adapters
   # Adapter integration tests. To use, implement two methods:
@@ -11,6 +12,7 @@ module Adapters
       if base.live_server?
         features = [:Common]
         features.concat extra_features
+        features << :SSL if base.ssl_mode?
         features.each {|name| base.send(:include, self.const_get(name)) }
         yield if block_given?
       elsif !defined? @warned
@@ -61,6 +63,17 @@ module Adapters
       end
     end
 
+    module SSL
+      def test_GET_ssl_fails_with_bad_cert
+        ca_file = 'tmp/faraday-different-ca-cert.crt'
+        conn = create_connection(:ssl => {:ca_file => ca_file})
+        err = assert_raises Faraday::SSLError do
+          conn.get('/ssl')
+        end
+        assert_includes err.message, "certificate"
+      end
+    end
+
     module Common
       extend Forwardable
       def_delegators :create_connection, :get, :head, :put, :post, :patch, :delete, :run_request
@@ -143,8 +156,7 @@ module Adapters
       end
 
       def test_HEAD_retrieves_no_response_body
-        # FIXME: some adapters return empty string, some nil
-        assert_equal '', head('echo').body.to_s
+        assert_equal '', head('echo').body
       end
 
       def test_HEAD_retrieves_the_response_headers
@@ -161,13 +173,13 @@ module Adapters
 
       def test_timeout
         conn = create_connection(:request => {:timeout => 1, :open_timeout => 1})
-        assert_raise Faraday::Error::TimeoutError do
+        assert_raises Faraday::Error::TimeoutError do
           conn.get '/slow'
         end
       end
 
       def test_connection_error
-        assert_raise Faraday::Error::ConnectionFailed do
+        assert_raises Faraday::Error::ConnectionFailed do
           get 'http://localhost:4'
         end
       end
@@ -190,18 +202,21 @@ module Adapters
         proxy_uri.password = 'WRONG'
         conn = create_connection(:proxy => proxy_uri)
 
-        err = assert_raise Faraday::Error::ConnectionFailed do
+        err = assert_raises Faraday::Error::ConnectionFailed do
           conn.get '/echo'
         end
 
-        unless self.class.ssl_mode? && (self.class.jruby? ||
-            adapter == :em_http || adapter == :em_synchrony)
+        unless self.class.ssl_mode? && self.class.jruby?
           # JRuby raises "End of file reached" which cannot be distinguished from a 407
-          # EM raises "connection closed by server" due to https://github.com/igrigorik/em-socksify/pull/19
           assert_equal %{407 "Proxy Authentication Required "}, err.message
         end
       end
 
+      def test_empty_body_response_represented_as_blank_string
+        response = get('204')
+        assert_equal '', response.body
+      end
+
       def adapter
         raise NotImplementedError.new("Need to override #adapter")
       end

data/test/adapters/logger_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+require File.expand_path('../../helper', __FILE__)
 require 'stringio'
 require 'logger'
 

data/test/adapters/net_http_persistent_test.rb

@@ -5,7 +5,16 @@ module Adapters
 
     def adapter() :net_http_persistent end
 
-    Integration.apply(self, :NonParallel)
+    Integration.apply(self, :NonParallel) do
+      def setup
+        if defined?(Net::HTTP::Persistent)
+          # work around problems with mixed SSL certificates
+          # https://github.com/drbrain/net-http-persistent/issues/45
+          http = Net::HTTP::Persistent.new('Faraday')
+          http.ssl_cleanup(4)
+        end
+      end if ssl_mode?
+    end
 
   end
 end

data/test/adapters/net_http_test.rb

@@ -1,6 +1,4 @@
 require File.expand_path('../integration', __FILE__)
-require 'ostruct'
-require 'uri'
 
 module Adapters
   class NetHttpTest < Faraday::TestCase
@@ -12,34 +10,5 @@ module Adapters
 
     Integration.apply(self, *behaviors)
 
-    def test_no_explicit_http_port_number
-      url = URI('http://example.com')
-      url.port = nil
-
-      adapter = Faraday::Adapter::NetHttp.new
-      http = adapter.net_http_connection(:url => url, :request => {})
-
-      assert_equal 80, http.port
-    end
-
-    def test_no_explicit_https_port_number
-      url = URI('https://example.com')
-      url.port = nil
-
-      adapter = Faraday::Adapter::NetHttp.new
-      http = adapter.net_http_connection(:url => url, :request => {})
-
-      assert_equal 443, http.port
-    end
-
-    def test_explicit_port_number
-      url = URI('https://example.com:1234')
-
-      adapter = Faraday::Adapter::NetHttp.new
-      http = adapter.net_http_connection(:url => url, :request => {})
-
-      assert_equal 1234, http.port
-    end
-
   end
 end

data/test/adapters/patron_test.rb

@@ -11,7 +11,10 @@ module Adapters
 
       # https://github.com/toland/patron/issues/52
       undef :test_GET_with_body
-    end unless RUBY_VERSION < '1.9' or jruby?
+
+      # no support for SSL peer verification
+      undef :test_GET_ssl_fails_with_bad_cert if ssl_mode?
+    end unless jruby?
 
   end
 end

data/test/adapters/test_middleware_test.rb

@@ -1,9 +1,10 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+require File.expand_path('../../helper', __FILE__)
 
 module Adapters
   class TestMiddleware < Faraday::TestCase
+    Stubs = Faraday::Adapter.lookup_middleware(:test)::Stubs
     def setup
-      @stubs = Faraday::Adapter::Test::Stubs.new
+      @stubs = Stubs.new
       @conn  = Faraday.new do |builder|
         builder.adapter :test, @stubs
       end
@@ -36,11 +37,18 @@ module Adapters
       @stubs.get('/optional?a=1') { [200, {}, 'a'] }
       assert_equal 'a', @conn.get('/optional?a=1&b=1').body
       assert_equal 'a', @conn.get('/optional?a=1').body
-      assert_raise Faraday::Adapter::Test::Stubs::NotFound do
+      assert_raises Faraday::Adapter::Test::Stubs::NotFound do
         @conn.get('/optional')
       end
     end
 
+    def test_middleware_with_http_headers
+      @stubs.get('/yo', { 'X-HELLO' => 'hello' }) { [200, {}, 'a'] }
+      @stubs.get('/yo') { [200, {}, 'b'] }
+      assert_equal 'a', @conn.get('/yo') { |env| env.headers['X-HELLO'] = 'hello' }.body
+      assert_equal 'b', @conn.get('/yo').body
+    end
+
     def test_middleware_allow_different_outcomes_for_the_same_request
       @stubs.get('/hello') { [200, {'Content-Type' => 'text/html'}, 'hello'] }
       @stubs.get('/hello') { [200, {'Content-Type' => 'text/html'}, 'world'] }
@@ -61,10 +69,46 @@ module Adapters
       assert_equal 'a', @conn.get('http://foo.com/hello?a=1').body
     end
 
+    def test_parses_params_with_default_encoder
+      @stubs.get '/hello' do |env|
+        assert_equal '1', env[:params]['a']['b']
+        [200, {}, 'a']
+      end
+
+      assert_equal 'a', @conn.get('http://foo.com/hello?a[b]=1').body
+    end
+
+    def test_parses_params_with_nested_encoder
+      @stubs.get '/hello' do |env|
+        assert_equal '1', env[:params]['a']['b']
+        [200, {}, 'a']
+      end
+
+      @conn.options.params_encoder = Faraday::NestedParamsEncoder
+      assert_equal 'a', @conn.get('http://foo.com/hello?a[b]=1').body
+    end
+
+    def test_parses_params_with_flat_encoder
+      @stubs.get '/hello' do |env|
+        assert_equal '1', env[:params]['a[b]']
+        [200, {}, 'a']
+      end
+
+      @conn.options.params_encoder = Faraday::FlatParamsEncoder
+      assert_equal 'a', @conn.get('http://foo.com/hello?a[b]=1').body
+    end
+
     def test_raises_an_error_if_no_stub_is_found_for_request
-      assert_raise Faraday::Adapter::Test::Stubs::NotFound do
+      assert_raises Stubs::NotFound do
         @conn.get('/invalid'){ [200, {}, []] }
       end
     end
+
+    def test_raises_an_error_if_no_stub_is_found_for_request_without_this_header
+      @stubs.get('/yo', { 'X-HELLO' => 'hello' }) { [200, {}, 'a'] }
+      assert_raises Faraday::Adapter::Test::Stubs::NotFound do
+        @conn.get('/yo')
+      end
+    end
   end
 end

data/test/adapters/typhoeus_test.rb

@@ -15,7 +15,14 @@ module Adapters
 
       # inconsistent outcomes ranging from successful response to connection error
       undef :test_proxy_auth_fail if ssl_mode?
-    end unless jruby? or ruby_22_plus?
 
+      def test_binds_local_socket
+        host = '1.2.3.4'
+        conn = create_connection :request => { :bind => { :host => host } }
+        assert_equal host, conn.options[:bind][:host]
+      end
+
+    end unless jruby?
   end
 end
+

data/test/authentication_middleware_test.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require File.expand_path('../helper', __FILE__)
 
 class AuthenticationMiddlewareTest < Faraday::TestCase
   def conn
     Faraday::Connection.new('http://example.net/') do |builder|
-      yield builder
+      yield(builder)
       builder.adapter :test do |stub|
         stub.get('/auth-echo') do |env|
           [200, {}, env[:request_headers]['Authorization']]