summaryrefslogtreecommitdiff
path: root/test/uri
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-13 04:57:25 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-13 04:57:25 +0000
commit80d8216415c3e42aab8237ef0b5696b488ecf387 (patch)
tree69abdec16e017f367f8c5506d6411e35459ccc39 /test/uri
parent0c252b43adb5a4aae03464783947c234652925c0 (diff)
* 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/trunk@42930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/uri')
-rw-r--r--test/uri/test_generic.rb4
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