faraday 0.9.1 → 0.17.1

data/test/adapters/test_middleware_test.rb

@@ -4,11 +4,32 @@ module Adapters
   class TestMiddleware < Faraday::TestCase
     Stubs = Faraday::Adapter.lookup_middleware(:test)::Stubs
     def setup
-      @stubs = Stubs.new
+      @stubs = Stubs.new do |stub|
+        stub.get('/hello') do
+          [200, {'Content-Type' => 'text/html'}, 'hello']
+        end
+        stub.get('/method-echo') do |env|
+          [200, {'Content-Type' => 'text/html'}, env[:method].to_s]
+        end
+        stub.get(/\A\/resources\/\d+(?:\?|\z)/) do
+          [200, {'Content-Type' => 'text/html'}, 'show']
+        end
+        stub.get(/\A\/resources\/(specified)\z/) do |env, meta|
+          [200, {'Content-Type' => 'text/html'}, "show #{meta[:match_data][1]}"]
+        end
+        stub.get('http://domain.test/hello') do
+          [200, {'Content-Type' => 'text/html'}, 'domain: hello']
+        end
+        stub.get('http://wrong.test/hello') do
+          [200, {'Content-Type' => 'text/html'}, 'wrong: hello']
+        end
+        stub.get('http://wrong.test/bait') do
+          [404, {'Content-Type' => 'text/html'}]
+        end
+      end
       @conn  = Faraday.new do |builder|
         builder.adapter :test, @stubs
       end
-      @stubs.get('/hello') { [200, {'Content-Type' => 'text/html'}, 'hello'] }
       @resp = @conn.get('/hello')
     end
 
@@ -24,8 +45,24 @@ module Adapters
       assert_equal 'hello', @resp.body
     end
 
+    def test_middleware_with_host_points_to_the_right_stub
+      assert_equal 'domain: hello', @conn.get('http://domain.test/hello').body
+    end
+
     def test_middleware_can_be_called_several_times
-      assert_equal 'hello', @conn.get("/hello").body
+      assert_equal 'hello', @conn.get('/hello').body
+    end
+
+    def test_middleware_can_handle_regular_expression_path
+      assert_equal 'show', @conn.get('/resources/1').body
+    end
+
+    def test_middleware_can_handle_single_parameter_block
+      assert_equal 'get', @conn.get('/method-echo').body
+    end
+
+    def test_middleware_can_handle_regular_expression_path_with_captured_result
+      assert_equal 'show specified', @conn.get('/resources/specified').body
     end
 
     def test_middleware_with_get_params
@@ -104,6 +141,12 @@ module Adapters
       end
     end
 
+    def test_raises_an_error_if_no_stub_is_found_for_specified_host
+      assert_raises Stubs::NotFound do
+        @conn.get('http://domain.test/bait')
+      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

data/test/adapters/typhoeus_test.rb

@@ -6,23 +6,33 @@ module Adapters
     def adapter() :typhoeus end
 
     Integration.apply(self, :Parallel) do
-      # https://github.com/dbalatero/typhoeus/issues/75
-      undef :test_GET_with_body
-
-      # Not a Typhoeus bug, but WEBrick inability to handle "100-continue"
-      # which libcurl seems to generate for this particular request:
-      undef :test_POST_sends_files
-
       # inconsistent outcomes ranging from successful response to connection error
       undef :test_proxy_auth_fail if ssl_mode?
 
+      # Typhoeus adapter not supporting Faraday::SSLError
+      undef :test_GET_ssl_fails_with_bad_cert if ssl_mode?
+
       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?
+      # Typhoeus::Response doesn't provide an easy way to access the reason phrase,
+      # so override the shared test from Common.
+      def test_GET_reason_phrase
+        response = get('echo')
+        assert_nil response.reason_phrase
+      end
+    end
+
+    def test_custom_adapter_config
+      adapter = Faraday::Adapter::Typhoeus.new(nil, { :forbid_reuse => true, :maxredirs => 1 })
+
+      request = adapter.method(:typhoeus_request).call({})
+
+      assert_equal true, request.options[:forbid_reuse]
+      assert_equal 1, request.options[:maxredirs]
+    end
   end
 end
-

data/test/composite_read_io_test.rb

@@ -40,22 +40,22 @@ class CompositeReadIOTest < Faraday::TestCase
     assert_equal "abc", io.read(3)
     assert_equal "d12", io.read(3)
     assert_equal "34", io.read(3)
-    assert_equal nil, io.read(3)
-    assert_equal nil, io.read(3)
+    assert_nil io.read(3)
+    assert_nil io.read(3)
   end
 
   def test_multipart_read_limited_size_larger_than_part
     io = composite_io(part("abcd"), part("1234"))
     assert_equal "abcd12", io.read(6)
     assert_equal "34", io.read(6)
-    assert_equal nil, io.read(6)
+    assert_nil io.read(6)
   end
 
   def test_multipart_read_with_blank_parts
     io = composite_io(part(""), part("abcd"), part(""), part("1234"), part(""))
     assert_equal "abcd12", io.read(6)
     assert_equal "34", io.read(6)
-    assert_equal nil, io.read(6)
+    assert_nil io.read(6)
   end
 
   def test_multipart_rewind
@@ -65,7 +65,7 @@ class CompositeReadIOTest < Faraday::TestCase
     io.rewind
     assert_equal "abc", io.read(3)
     assert_equal "d1234", io.read(5)
-    assert_equal nil, io.read(3)
+    assert_nil io.read(3)
     io.rewind
     assert_equal "ab", io.read(2)
   end
@@ -86,21 +86,19 @@ class CompositeReadIOTest < Faraday::TestCase
     end
   end
 
-  unless RUBY_VERSION < '1.9'
-    def test_read_from_multibyte
-      File.open(File.dirname(__FILE__) + '/multibyte.txt') do |utf8|
-        io = composite_io(part("\x86"), Part.new(utf8))
-        assert_equal bin("\x86\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\n"), io.read
-      end
+  def test_read_from_multibyte
+    File.open(File.dirname(__FILE__) + '/multibyte.txt') do |utf8|
+      io = composite_io(part("\x86"), Part.new(utf8))
+      assert_equal bin("\x86\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\n"), io.read
     end
+  end
 
-    def test_limited_from_multibyte
-      File.open(File.dirname(__FILE__) + '/multibyte.txt') do |utf8|
-        io = composite_io(part("\x86"), Part.new(utf8))
-        assert_equal bin("\x86\xE3\x83"), io.read(3)
-        assert_equal bin("\x95\xE3\x82"), io.read(3)
-        assert_equal bin("\xA1\xE3\x82\xA4\xE3\x83\xAB\n"), io.read(8)
-      end
+  def test_limited_from_multibyte
+    File.open(File.dirname(__FILE__) + '/multibyte.txt') do |utf8|
+      io = composite_io(part("\x86"), Part.new(utf8))
+      assert_equal bin("\x86\xE3\x83"), io.read(3)
+      assert_equal bin("\x95\xE3\x82"), io.read(3)
+      assert_equal bin("\xA1\xE3\x82\xA4\xE3\x83\xAB\n"), io.read(8)
     end
   end