From 3b4790163cd6d6721c2cfb117f0a56070cbf9a9c Mon Sep 17 00:00:00 2001 From: Christian Mehlmauer Date: Fri, 19 Jul 2013 23:07:58 +0200 Subject: [PATCH] fix rspecs --- spec/lib/common/browser_spec.rb | 5 +++-- spec/samples/conf/browser/browser.conf.json | 1 + spec/samples/conf/browser/browser.conf_proxy.json | 3 ++- spec/samples/conf/browser/browser.conf_proxy_auth.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/spec/lib/common/browser_spec.rb b/spec/lib/common/browser_spec.rb index da25aea2..40f2c6b2 100644 --- a/spec/lib/common/browser_spec.rb +++ b/spec/lib/common/browser_spec.rb @@ -17,7 +17,7 @@ describe Browser do let(:options) { {} } let(:instance_vars_to_check) { ['user_agent', 'user_agent_mode', 'available_user_agents', 'proxy', - 'max_threads', 'cache_ttl'] + 'max_threads', 'cache_ttl', 'request_timeout', 'connect_timeout'] } let(:json_config_without_proxy) { JSON.parse(File.read(CONFIG_FILE_WITHOUT_PROXY)) } let(:json_config_with_proxy) { JSON.parse(File.read(CONFIG_FILE_WITH_PROXY)) } @@ -136,7 +136,8 @@ describe Browser do cache_ttl: 250, headers: { 'User-Agent' => 'SomeUA' }, ssl_verifypeer: false, ssl_verifyhost: 0, - cookiejar: cookie_jar, cookiefile: cookie_jar + cookiejar: cookie_jar, cookiefile: cookie_jar, + timeout: 2000, connecttimeout: 1000 } } diff --git a/spec/samples/conf/browser/browser.conf.json b/spec/samples/conf/browser/browser.conf.json index 21464e08..9edbddfc 100644 --- a/spec/samples/conf/browser/browser.conf.json +++ b/spec/samples/conf/browser/browser.conf.json @@ -3,5 +3,6 @@ "user_agent_mode": "static", "cache_ttl": 300, "request_timeout": 2000, + "connect_timeout": 1000, "max_threads": 5 } diff --git a/spec/samples/conf/browser/browser.conf_proxy.json b/spec/samples/conf/browser/browser.conf_proxy.json index 175569f4..afec262e 100644 --- a/spec/samples/conf/browser/browser.conf_proxy.json +++ b/spec/samples/conf/browser/browser.conf_proxy.json @@ -3,5 +3,6 @@ "user_agent_mode": "static", "proxy": "127.0.0.1:3038", "cache_ttl": 300, - "request_timeout": 2000 + "request_timeout": 2000, + "connect_timeout": 1000 } diff --git a/spec/samples/conf/browser/browser.conf_proxy_auth.json b/spec/samples/conf/browser/browser.conf_proxy_auth.json index b5fea1fd..6399f8dc 100644 --- a/spec/samples/conf/browser/browser.conf_proxy_auth.json +++ b/spec/samples/conf/browser/browser.conf_proxy_auth.json @@ -4,5 +4,6 @@ "proxy": "127.0.0.1:3038", "proxy_auth": "user:pass", "cache_ttl": 300, - "request_timeout": 2000 + "request_timeout": 2000, + "connect_timeout": 1000 }