faraday 0.9.0.rc5 → 0.9.0.rc6

data/lib/faraday/response/raise_error.rb

@@ -6,6 +6,9 @@ module Faraday
       case env[:status]
       when 404
         raise Faraday::Error::ResourceNotFound, response_values(env)
+      when 407
+        # mimic the behavior that we get with proxy requests with HTTPS
+        raise Faraday::Error::ConnectionFailed, %{407 "Proxy Authentication Required "}
       when ClientErrorStatuses
         raise Faraday::Error::ClientError, response_values(env)
       end

data/lib/faraday/utils.rb

@@ -11,10 +11,10 @@ module Faraday
         new(value)
       end
 
-      def initialize(hash={})
+      def initialize(hash = nil)
         super()
         @names = {}
-        self.update hash
+        self.update(hash || {})
       end
 
       # need to synchronize concurrent writes to the shared KeyMap
@@ -45,6 +45,12 @@ module Faraday
         super k, v
       end
 
+      def fetch(k, *args, &block)
+        k = KeyMap[k]
+        key = @names.fetch(k.downcase, k)
+        super(key, *args, &block)
+      end
+
       def delete(k)
         k = KeyMap[k]
         if k = @names[k.downcase]
@@ -162,8 +168,8 @@ module Faraday
     ESCAPE_RE = /[^a-zA-Z0-9 .~_-]/
 
     def escape(s)
-      s.to_s.gsub(ESCAPE_RE) {
-        '%' + $&.unpack('H2' * $&.bytesize).join('%').upcase
+      s.to_s.gsub(ESCAPE_RE) {|match|
+        '%' + match.unpack('H2' * match.bytesize).join('%').upcase
       }.tr(' ', '+')
     end
 

data/script/proxy-server

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+# Usage: script/proxy-server [-p PORT] [-u USER:PASSWORD]
+require 'webrick'
+require 'webrick/httpproxy'
+
+port = 4001
+
+if found = ARGV.index('-p')
+  port = ARGV[found + 1].to_i
+end
+if found = ARGV.index('-u')
+  username, password = ARGV[found + 1].split(':', 2)
+end
+
+match_credentials = lambda { |credentials|
+  got_username, got_password = credentials.to_s.unpack("m*")[0].split(":", 2)
+  got_username == username && got_password == password
+}
+
+log_io = $stdout
+log_io.sync = true
+
+webrick_opts = {
+  :Port => port, :Logger => WEBrick::Log::new(log_io),
+  :AccessLog => [[log_io, "[%{X-Faraday-Adapter}i] %m  %U  ->  %s %b"]],
+  :ProxyAuthProc => lambda { |req, res|
+    if username
+      type, credentials = req.header['proxy-authorization'].first.to_s.split(/\s+/, 2)
+      unless "Basic" == type && match_credentials.call(credentials)
+        res['proxy-authenticate'] = %{Basic realm="testing"}
+        raise WEBrick::HTTPStatus::ProxyAuthenticationRequired
+      end
+    end
+  }
+}
+
+proxy = WEBrick::HTTPProxyServer.new(webrick_opts)
+
+trap(:TERM) { proxy.shutdown }
+trap(:INT) { proxy.shutdown }
+
+proxy.start

data/script/server

@@ -6,15 +6,13 @@ ensure
   $VERBOSE = old_verbose
 end
 require 'webrick'
-require 'fileutils'
 
 port = 4000
 if found = ARGV.index('-p')
   port = ARGV[found + 1].to_i
 end
 
-FileUtils.mkdir_p('log')
-log_io = File.open('log/test.log', 'w')
+log_io = $stdout
 log_io.sync = true
 
 webrick_opts = {

data/script/test

@@ -24,6 +24,7 @@ if [[ "$RUBYOPT" != *"bundler/setup"* ]]; then
 fi
 
 port=3999
+proxy_port=3998
 scheme=http
 
 if [ "$SSL" = "yes" ]; then
@@ -47,12 +48,18 @@ filter_matching() {
 
 start_server() {
   mkdir -p log
-  script/server -p $port >log/server.log 2>&1 &
+  script/server -p $port >log/test.log 2>&1 &
+  echo $!
+}
+
+start_proxy() {
+  mkdir -p log
+  script/proxy-server -p $proxy_port -u "faraday@test.local:there is cake" >log/proxy.log 2>&1 &
   echo $!
 }
 
 server_started() {
-  lsof -i :$port >/dev/null
+  lsof -i :${1?} >/dev/null
 }
 
 timestamp() {
@@ -62,7 +69,7 @@ timestamp() {
 wait_for_server() {
   timeout=$(( `timestamp` + $1 ))
   while true; do
-    if server_started; then
+    if server_started "$2"; then
       break
     elif [ `timestamp` -gt "$timeout" ]; then
       echo "timed out after $1 seconds" >&2
@@ -109,27 +116,47 @@ fi
 
 # If there are any adapter tests, spin up the HTTP server
 if [ -n "$(filter_matching "adapters" "${test_files[@]}")" ]; then
-  if server_started; then
+  if server_started $port; then
     echo "aborted: another instance of server running on $port" >&2
     exit 1
   fi
   server_pid=$(start_server)
-  wait_for_server 15 || {
-    cat log/server.log
+  proxy_pid=$(start_proxy)
+  wait_for_server 30 $port || {
+    cat log/test.log
+    kill "$server_pid"
+    kill "$proxy_pid"
     exit 1
   }
+  wait_for_server 5 $proxy_port
   cleanup() {
     if [ $? -ne 0 ] && [ -n "$TRAVIS" ]; then
       cat log/test.log
     fi
     kill "$server_pid"
+    kill "$proxy_pid"
   }
   trap cleanup INT EXIT
   export LIVE="${scheme}://localhost:${port}"
+  export LIVE_PROXY="http://faraday%40test.local:there%20is%20cake@localhost:${proxy_port}"
 fi
 
+warnings="${TMPDIR:-/tmp}/faraday-warnings.$$"
+
 run_test_files() {
-  ruby -e 'while f=ARGV.shift and f!="--"; load f; end' "${test_files[@]}" -- "$@"
+  # Save warnings on stderr to a separate file
+  RUBYOPT="$RUBYOPT -w" ruby -e 'while f=ARGV.shift and f!="--"; load f; end' "${test_files[@]}" -- "$@" \
+    2> >(tee >(grep 'warning:' >"$warnings") | grep -v 'warning:')
+}
+
+check_warnings() {
+  # Display Ruby warnings from this project's source files. Abort if any were found.
+  num="$(grep -F "$PWD" "$warnings" | grep -v "${PWD}/bundle" | sort | uniq -c | sort -rn | tee /dev/stderr | wc -l)"
+  rm -f "$warnings"
+  if [ "$num" -gt 0 ]; then
+    echo "FAILED: this test suite doesn't tolerate Ruby syntax warnings!" >&2
+    exit 1
+  fi
 }
 
 if [ -n "$RBENV_VERSIONS" ]; then
@@ -142,3 +169,4 @@ else
   run_test_files "$@"
 fi
 
+check_warnings

data/test/adapters/excon_test.rb

@@ -8,6 +8,10 @@ module Adapters
     Integration.apply(self, :NonParallel) do
       # https://github.com/geemus/excon/issues/126 ?
       undef :test_timeout if ssl_mode?
+
+      # Excon lets OpenSSL::SSL::SSLError be raised without any way to
+      # distinguish whether it happened because of a 407 proxy response
+      undef :test_proxy_auth_fail if ssl_mode?
     end
   end
 end

data/test/adapters/httpclient_test.rb

@@ -6,6 +6,11 @@ module Adapters
     def adapter() :httpclient end
 
     Integration.apply(self, :NonParallel) do
+      def setup
+        require 'httpclient' unless defined?(HTTPClient)
+        HTTPClient::NO_PROXY_HOSTS.delete('localhost')
+      end
+
       def test_binds_local_socket
         host = '1.2.3.4'
         conn = create_connection :request => { :bind => { :host => host } }

data/test/adapters/integration.rb

@@ -12,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
@@ -58,7 +59,18 @@ module Adapters
     module Compression
       def test_GET_handles_compression
         res = get('echo_header', :name => 'accept-encoding')
-        assert_match /gzip;.+\bdeflate\b/, res.body
+        assert_match(/gzip;.+\bdeflate\b/, res.body)
+      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
 
@@ -118,7 +130,7 @@ module Adapters
         resp = post('file') do |req|
           req.body = {'uploaded_file' => Faraday::UploadIO.new(__FILE__, 'text/x-ruby')}
         end
-        assert_equal "file integration.rb text/x-ruby", resp.body
+        assert_equal "file integration.rb text/x-ruby #{File.size(__FILE__)}", resp.body
       end
 
       def test_PUT_send_url_encoded_params
@@ -166,6 +178,40 @@ module Adapters
         end
       end
 
+      def test_connection_error
+        assert_raises Faraday::Error::ConnectionFailed do
+          get 'http://localhost:4'
+        end
+      end
+
+      def test_proxy
+        proxy_uri = URI(ENV['LIVE_PROXY'])
+        conn = create_connection(:proxy => proxy_uri)
+
+        res = conn.get '/echo'
+        assert_equal 'get', res.body
+
+        unless self.class.ssl_mode?
+          # proxy can't append "Via" header for HTTPS responses
+          assert_match(/:#{proxy_uri.port}$/, res['via'])
+        end
+      end
+
+      def test_proxy_auth_fail
+        proxy_uri = URI(ENV['LIVE_PROXY'])
+        proxy_uri.password = 'WRONG'
+        conn = create_connection(:proxy => proxy_uri)
+
+        err = assert_raises Faraday::Error::ConnectionFailed do
+          conn.get '/echo'
+        end
+
+        unless self.class.ssl_mode? && self.class.jruby?
+          # JRuby raises "End of file reached" which cannot be distinguished from a 407
+          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

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/patron_test.rb

@@ -11,6 +11,9 @@ module Adapters
 
       # https://github.com/toland/patron/issues/52
       undef :test_GET_with_body
+
+      # no support for SSL peer verification
+      undef :test_GET_ssl_fails_with_bad_cert if ssl_mode?
     end unless jruby?
 
   end

data/test/adapters/rack_test.rb

@@ -22,5 +22,10 @@ module Adapters
       rescue Faraday::Error::ClientError
       end
     end
+
+    # test not applicable
+    undef test_connection_error
+    undef test_proxy
+    undef test_proxy_auth_fail
   end
 end

data/test/adapters/typhoeus_test.rb

@@ -13,25 +13,15 @@ module Adapters
       # 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?
+
       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
 
-      def test_GET_ssl_rejects_bad_hosts
-        original_ssl_file = ENV['SSL_FILE']
-        begin
-          ENV['SSL_FILE'] = 'tmp/faraday-different-ca-cert.crt'
-          conn = create_connection
-          expected = ''
-          response = conn.get('/ssl')
-          assert_equal expected, response.body
-        ensure
-          ENV['SSL_FILE'] = original_ssl_file
-        end
-      end if ssl_mode?
-
     end unless jruby?
   end
 end

data/test/authentication_middleware_test.rb

@@ -37,9 +37,9 @@ class AuthenticationMiddlewareTest < Faraday::TestCase
     response = conn { |b|
       b.request :token_auth, 'baz', :foo => 42
     }.get('/auth-echo')
-    assert_match /^Token /, response.body
-    assert_match /token="baz"/, response.body
-    assert_match /foo="42"/, response.body
+    assert_match(/^Token /, response.body)
+    assert_match(/token="baz"/, response.body)
+    assert_match(/foo="42"/, response.body)
   end
 
   def test_token_middleware_does_not_interfere_with_existing_authorization
@@ -52,14 +52,14 @@ class AuthenticationMiddlewareTest < Faraday::TestCase
     response = conn { |b|
       b.request :authorization, 'custom', 'abc def'
     }.get('/auth-echo')
-    assert_match /^custom abc def$/, response.body
+    assert_match(/^custom abc def$/, response.body)
   end
 
   def test_authorization_middleware_with_hash
     response = conn { |b|
       b.request :authorization, 'baz', :foo => 42
     }.get('/auth-echo')
-    assert_match /^baz /, response.body
-    assert_match /foo="42"/, response.body
+    assert_match(/^baz /, response.body)
+    assert_match(/foo="42"/, response.body)
   end
 end

data/test/connection_test.rb

@@ -2,10 +2,6 @@ require File.expand_path('../helper', __FILE__)
 
 class TestConnection < Faraday::TestCase
 
-  def teardown
-    Faraday::Utils.default_params_encoder = nil
-  end
-
   def with_env(key, proxy)
     old_value = ENV.fetch(key, false)
     ENV[key] = proxy
@@ -101,109 +97,137 @@ class TestConnection < Faraday::TestCase
     assert_match(/nonce="abc"/, auth)
   end
 
-  def test_build_url_uses_connection_host_as_default_uri_host
+  def test_build_exclusive_url_uses_connection_host_as_default_uri_host
     conn = Faraday::Connection.new
     conn.host = 'sushi.com'
     uri = conn.build_exclusive_url("/sake.html")
     assert_equal 'sushi.com', uri.host
   end
 
-  def test_build_url_overrides_connection_port_for_absolute_urls
+  def test_build_exclusive_url_overrides_connection_port_for_absolute_urls
     conn = Faraday::Connection.new
     conn.port = 23
     uri = conn.build_exclusive_url("http://sushi.com")
     assert_equal 80, uri.port
   end
 
-  def test_build_url_uses_connection_scheme_as_default_uri_scheme
+  def test_build_exclusive_url_uses_connection_scheme_as_default_uri_scheme
     conn = Faraday::Connection.new 'http://sushi.com'
     uri = conn.build_exclusive_url("/sake.html")
     assert_equal 'http', uri.scheme
   end
 
-  def test_build_url_uses_connection_path_prefix_to_customize_path
+  def test_build_exclusive_url_uses_connection_path_prefix_to_customize_path
     conn = Faraday::Connection.new
     conn.path_prefix = '/fish'
     uri = conn.build_exclusive_url("sake.html")
     assert_equal '/fish/sake.html', uri.path
   end
 
-  def test_build_url_uses_root_connection_path_prefix_to_customize_path
+  def test_build_exclusive_url_uses_root_connection_path_prefix_to_customize_path
     conn = Faraday::Connection.new
     conn.path_prefix = '/'
     uri = conn.build_exclusive_url("sake.html")
     assert_equal '/sake.html', uri.path
   end
 
-  def test_build_url_forces_connection_path_prefix_to_be_absolute
+  def test_build_exclusive_url_forces_connection_path_prefix_to_be_absolute
     conn = Faraday::Connection.new
     conn.path_prefix = 'fish'
     uri = conn.build_exclusive_url("sake.html")
     assert_equal '/fish/sake.html', uri.path
   end
 
-  def test_build_url_ignores_connection_path_prefix_trailing_slash
+  def test_build_exclusive_url_ignores_connection_path_prefix_trailing_slash
     conn = Faraday::Connection.new
     conn.path_prefix = '/fish/'
     uri = conn.build_exclusive_url("sake.html")
     assert_equal '/fish/sake.html', uri.path
   end
 
-  def test_build_url_allows_absolute_uri_to_ignore_connection_path_prefix
+  def test_build_exclusive_url_allows_absolute_uri_to_ignore_connection_path_prefix
     conn = Faraday::Connection.new
     conn.path_prefix = '/fish'
     uri = conn.build_exclusive_url("/sake.html")
     assert_equal '/sake.html', uri.path
   end
 
-  def test_build_url_parses_url_params_into_path
+  def test_build_exclusive_url_parses_url_params_into_path
     conn = Faraday::Connection.new
     uri = conn.build_exclusive_url("http://sushi.com/sake.html")
     assert_equal '/sake.html', uri.path
   end
 
-  def test_build_url_doesnt_add_ending_slash_given_nil_url
+  def test_build_exclusive_url_doesnt_add_ending_slash_given_nil_url
     conn = Faraday::Connection.new
     conn.url_prefix = "http://sushi.com/nigiri"
     uri = conn.build_exclusive_url
     assert_equal "/nigiri", uri.path
   end
 
-  def test_build_url_doesnt_add_ending_slash_given_empty_url
+  def test_build_exclusive_url_doesnt_add_ending_slash_given_empty_url
     conn = Faraday::Connection.new
     conn.url_prefix = "http://sushi.com/nigiri"
     uri = conn.build_exclusive_url('')
     assert_equal "/nigiri", uri.path
   end
-
-  def test_build_url_parses_url_params_into_query
-    uri = build_url("http://sushi.com/sake.html", 'a[b]' => '1 + 2')
+  
+  def test_build_exclusive_url_doesnt_use_connection_params
+    conn = Faraday::Connection.new "http://sushi.com/nigiri"
+    conn.params = {:a => 1}
+    assert_equal "http://sushi.com/nigiri", conn.build_exclusive_url.to_s
+  end
+  
+  def test_build_exclusive_url_uses_argument_params
+    conn = Faraday::Connection.new "http://sushi.com/nigiri"
+    conn.params = {:a => 1}
+    params = Faraday::Utils::ParamsHash.new
+    params[:a] = 2
+    url = conn.build_exclusive_url(nil, params)
+    assert_equal "http://sushi.com/nigiri?a=2", url.to_s
+  end
+  
+  def test_build_url_uses_params
+    conn = Faraday::Connection.new "http://sushi.com/nigiri"
+    conn.params = {:a => 1, :b => 1}
+    assert_equal "http://sushi.com/nigiri?a=1&b=1", conn.build_url.to_s
+  end
+  
+  def test_build_url_merges_params
+    conn = Faraday::Connection.new "http://sushi.com/nigiri"
+    conn.params = {:a => 1, :b => 1}
+    url = conn.build_url(nil, :b => 2, :c => 3)
+    assert_equal "http://sushi.com/nigiri?a=1&b=2&c=3", url.to_s
+  end
+
+  def test_env_url_parses_url_params_into_query
+    uri = env_url("http://sushi.com/sake.html", 'a[b]' => '1 + 2')
     assert_equal "a%5Bb%5D=1+%2B+2", uri.query
   end
 
-  def test_build_url_escapes_per_spec
-    uri = build_url('http:/', 'a' => '1+2 foo~bar.-baz')
+  def test_env_url_escapes_per_spec
+    uri = env_url('http:/', 'a' => '1+2 foo~bar.-baz')
     assert_equal "a=1%2B2+foo~bar.-baz", uri.query
   end
 
-  def test_build_url_bracketizes_nested_params_in_query
-    url = build_url nil, 'a' => {'b' => 'c'}
+  def test_env_url_bracketizes_nested_params_in_query
+    url = env_url nil, 'a' => {'b' => 'c'}
     assert_equal "a%5Bb%5D=c", url.query
   end
 
-  def test_build_url_bracketizes_repeated_params_in_query
-    uri = build_url("http://sushi.com/sake.html", 'a' => [1, 2])
+  def test_env_url_bracketizes_repeated_params_in_query
+    uri = env_url("http://sushi.com/sake.html", 'a' => [1, 2])
     assert_equal "a%5B%5D=1&a%5B%5D=2", uri.query
   end
 
-  def test_build_url_without_braketizing_repeated_params_in_query
-    uri = build_url 'http://sushi.com', 'a' => [1, 2] do |conn|
+  def test_env_url_without_braketizing_repeated_params_in_query
+    uri = env_url 'http://sushi.com', 'a' => [1, 2] do |conn|
       conn.options.params_encoder = Faraday::FlatParamsEncoder
     end
     assert_equal "a=1&a=2", uri.query
   end
 
-  def test_build_url_parses_url
+  def test_build_exclusive_url_parses_url
     conn = Faraday::Connection.new
     uri = conn.build_exclusive_url("http://sushi.com/sake.html")
     assert_equal "http",       uri.scheme
@@ -211,32 +235,32 @@ class TestConnection < Faraday::TestCase
     assert_equal '/sake.html', uri.path
   end
 
-  def test_build_url_parses_url_and_changes_scheme
+  def test_build_exclusive_url_parses_url_and_changes_scheme
     conn = Faraday::Connection.new :url => "http://sushi.com/sushi"
     conn.scheme = 'https'
     uri = conn.build_exclusive_url("sake.html")
     assert_equal 'https://sushi.com/sushi/sake.html', uri.to_s
   end
 
-  def test_build_url_joins_url_to_base_with_ending_slash
+  def test_build_exclusive_url_joins_url_to_base_with_ending_slash
     conn = Faraday::Connection.new :url => "http://sushi.com/sushi/"
     uri = conn.build_exclusive_url("sake.html")
     assert_equal 'http://sushi.com/sushi/sake.html', uri.to_s
   end
 
-  def test_build_url_used_default_base_with_ending_slash
+  def test_build_exclusive_url_used_default_base_with_ending_slash
     conn = Faraday::Connection.new :url => "http://sushi.com/sushi/"
     uri = conn.build_exclusive_url
     assert_equal 'http://sushi.com/sushi/', uri.to_s
   end
 
-  def test_build_url_overrides_base
+  def test_build_exclusive_url_overrides_base
     conn = Faraday::Connection.new :url => "http://sushi.com/sushi/"
     uri = conn.build_exclusive_url('/sake/')
     assert_equal 'http://sushi.com/sake/', uri.to_s
   end
 
-  def test_build_url_handles_uri_instances
+  def test_build_exclusive_url_handles_uri_instances
     conn = Faraday::Connection.new
     uri = conn.build_exclusive_url(URI('/sake.html'))
     assert_equal '/sake.html', uri.path
@@ -291,6 +315,42 @@ class TestConnection < Faraday::TestCase
     end
   end
 
+  def test_proxy_accepts_env_without_scheme
+    with_env 'http_proxy', "localhost:8888" do
+      uri = Faraday::Connection.new.proxy[:uri]
+      assert_equal 'localhost', uri.host
+      assert_equal 8888, uri.port
+    end
+  end
+
+  def test_no_proxy_from_env
+    with_env 'http_proxy', nil do
+      conn = Faraday::Connection.new
+      assert_equal nil, conn.proxy
+    end
+  end
+
+  def test_no_proxy_from_blank_env
+    with_env 'http_proxy', '' do
+      conn = Faraday::Connection.new
+      assert_equal nil, conn.proxy
+    end
+  end
+
+  def test_proxy_doesnt_accept_uppercase_env
+    with_env 'HTTP_PROXY', "http://localhost:8888/" do
+      conn = Faraday::Connection.new
+      assert_nil conn.proxy
+    end
+  end
+
+  def test_proxy_requires_uri
+    conn = Faraday::Connection.new
+    assert_raises ArgumentError do
+      conn.proxy :uri => :bad_uri, :user => 'rick'
+    end
+  end
+
   def test_dups_connection_object
     conn = Faraday::Connection.new 'http://sushi.com/foo',
       :ssl => { :verify => :none },
@@ -333,7 +393,7 @@ class TestConnection < Faraday::TestCase
     assert_equal '/omnom', conn.path_prefix
   end
 
-  def build_url(url, params)
+  def env_url(url, params)
     conn = Faraday::Connection.new(url, :params => params)
     yield conn if block_given?
     req = conn.build_request(:get)
@@ -356,6 +416,16 @@ class TestRequestParams < Faraday::TestCase
     assert_equal expected, query.split('&').sort
   end
 
+  def with_default_params_encoder(encoder)
+    old_encoder = Faraday::Utils.default_params_encoder
+    begin
+      Faraday::Utils.default_params_encoder = encoder
+      yield
+    ensure
+      Faraday::Utils.default_params_encoder = old_encoder
+    end
+  end
+
   def test_merges_connection_and_request_params
     create_connection 'http://a.co/?token=abc', :params => {'format' => 'json'}
     query = get '?page=1', :limit => 5
@@ -412,31 +482,35 @@ class TestRequestParams < Faraday::TestCase
   end
 
   def test_array_params_in_url
-    Faraday::Utils.default_params_encoder = nil
-    create_connection 'http://a.co/page1?color[]=red&color[]=blue'
-    query = get
-    assert_equal "color%5B%5D=red&color%5B%5D=blue", query
+    with_default_params_encoder(nil) do
+      create_connection 'http://a.co/page1?color[]=red&color[]=blue'
+      query = get
+      assert_equal "color%5B%5D=red&color%5B%5D=blue", query
+    end
   end
 
   def test_array_params_in_params
-    Faraday::Utils.default_params_encoder = nil
-    create_connection 'http://a.co/page1', :params => {:color => ['red', 'blue']}
-    query = get
-    assert_equal "color%5B%5D=red&color%5B%5D=blue", query
+    with_default_params_encoder(nil) do
+      create_connection 'http://a.co/page1', :params => {:color => ['red', 'blue']}
+      query = get
+      assert_equal "color%5B%5D=red&color%5B%5D=blue", query
+    end
   end
 
   def test_array_params_in_url_with_flat_params
-    Faraday::Utils.default_params_encoder = Faraday::FlatParamsEncoder
-    create_connection 'http://a.co/page1?color=red&color=blue'
-    query = get
-    assert_equal "color=red&color=blue", query
+    with_default_params_encoder(Faraday::FlatParamsEncoder) do
+      create_connection 'http://a.co/page1?color=red&color=blue'
+      query = get
+      assert_equal "color=red&color=blue", query
+    end
   end
 
   def test_array_params_in_params_with_flat_params
-    Faraday::Utils.default_params_encoder = Faraday::FlatParamsEncoder
-    create_connection 'http://a.co/page1', :params => {:color => ['red', 'blue']}
-    query = get
-    assert_equal "color=red&color=blue", query
+    with_default_params_encoder(Faraday::FlatParamsEncoder) do
+      create_connection 'http://a.co/page1', :params => {:color => ['red', 'blue']}
+      query = get
+      assert_equal "color=red&color=blue", query
+    end
   end
 
   def get(*args)