From dbeab13512ec5cf8dd6e39bded0d28f153988c68 Mon Sep 17 00:00:00 2001 From: Erik Michaels-Ober Date: Fri, 8 Oct 2010 13:04:45 -0700 Subject: [PATCH] Fix tests with duplicate names (they weren't being executed) --- test/connection_test.rb | 6 ------ test/env_test.rb | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/test/connection_test.rb b/test/connection_test.rb index f1d84abc..a4357189 100644 --- a/test/connection_test.rb +++ b/test/connection_test.rb @@ -179,12 +179,6 @@ class TestConnection < Faraday::TestCase assert_equal 'https://sushi.com/sushi/sake.html', uri.to_s end - def test_proxy_accepts_string - conn = Faraday::Connection.new - conn.proxy 'http://proxy.com' - assert_equal 'proxy.com', conn.proxy.host - end - def test_proxy_accepts_string conn = Faraday::Connection.new conn.proxy 'http://proxy.com' diff --git a/test/env_test.rb b/test/env_test.rb index 5fa879b6..0e589e6b 100644 --- a/test/env_test.rb +++ b/test/env_test.rb @@ -34,7 +34,7 @@ class TestEnv < Faraday::TestCase assert_equal @input[:body], @env[:body] end - def test_request_create_stores_ssl_options + def test_request_create_stores_timeout_options assert_equal 3, @env[:request][:timeout] assert_equal 5, @env[:request][:open_timeout] end @@ -53,4 +53,4 @@ class TestEnv < Faraday::TestCase end env_setup.to_env_hash(connection, :get) end -end \ No newline at end of file +end