diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-26 16:08:11 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-26 16:08:11 +0000 |
| commit | b5ad2a59511eeede20849ae2aecf1018f5571ff8 (patch) | |
| tree | d43d5dcc1447465802452496444bbf48690e067f /test | |
| parent | fe17a46edf43cac07432c1b5a32dd1a9fbe62f7e (diff) | |
merge revision(s) 42930: [Backport #8898]
* lib/uri/generic.rb (URI::Generic.find_proxy): return nil if
http_proxy environment variable is empty string.
[ruby-core:57140] [Bug #8898]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/uri/test_generic.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/uri/test_generic.rb b/test/uri/test_generic.rb index d22d3c1dd6..e8becd5b8e 100644 --- a/test/uri/test_generic.rb +++ b/test/uri/test_generic.rb @@ -760,12 +760,12 @@ class URI::TestGeneric < Test::Unit::TestCase assert_nil(URI("http://192.0.2.2/").find_proxy) } with_env('http_proxy'=>'') { - assert_equal(URI(''), URI("http://192.0.2.1/").find_proxy) + assert_nil(URI("http://192.0.2.1/").find_proxy) assert_nil(URI("ftp://192.0.2.1/").find_proxy) } with_env('ftp_proxy'=>'') { assert_nil(URI("http://192.0.2.1/").find_proxy) - assert_equal(URI(''), URI("ftp://192.0.2.1/").find_proxy) + assert_nil(URI("ftp://192.0.2.1/").find_proxy) } end |