Added failing tests

lostisland · Dec 5, 2017 · bf1a28c · bf1a28c
1 parent 50d03b8
commit bf1a28c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/test/connection_test.rb b/test/connection_test.rb
@@ -376,6 +376,13 @@ def test_dynamic_proxy
     end
   end
 
+  def test_nil_proxy_overrides_env
+    with_env 'http_proxy' => 'http://duncan.proxy.com:80' do
+      conn = Faraday::Connection.new(proxy: nil)
+      assert_nil conn.proxy
+    end
+  end
+
   if URI.parse('').respond_to?(:find_proxy)
     def test_proxy_allowed_when_url_in_no_proxy_list
       with_env 'http_proxy' => 'http://proxy.com', 'no_proxy' => 'example.com' do

diff --git a/test/options_test.rb b/test/options_test.rb
@@ -159,6 +159,11 @@ def test_proxy_options_from_string
     assert_equal 'http', options.scheme
   end
 
+  def test_proxy_options_from_nil
+    options = Faraday::ProxyOptions.from nil
+    assert_nil options
+  end
+
   def test_proxy_options_hash_access
     proxy = Faraday::ProxyOptions.from 'http://a%40b:pw%20d@example.org'
     assert_equal 'a@b', proxy[:user]