fix rspecs

This commit is contained in:
Christian Mehlmauer
2013-07-19 23:07:58 +02:00
parent fd1e0da4df
commit 3b4790163c
4 changed files with 8 additions and 4 deletions

View File

@@ -17,7 +17,7 @@ describe Browser do
let(:options) { {} } let(:options) { {} }
let(:instance_vars_to_check) { let(:instance_vars_to_check) {
['user_agent', 'user_agent_mode', 'available_user_agents', 'proxy', ['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_without_proxy) { JSON.parse(File.read(CONFIG_FILE_WITHOUT_PROXY)) }
let(:json_config_with_proxy) { JSON.parse(File.read(CONFIG_FILE_WITH_PROXY)) } let(:json_config_with_proxy) { JSON.parse(File.read(CONFIG_FILE_WITH_PROXY)) }
@@ -136,7 +136,8 @@ describe Browser do
cache_ttl: 250, cache_ttl: 250,
headers: { 'User-Agent' => 'SomeUA' }, headers: { 'User-Agent' => 'SomeUA' },
ssl_verifypeer: false, ssl_verifyhost: 0, ssl_verifypeer: false, ssl_verifyhost: 0,
cookiejar: cookie_jar, cookiefile: cookie_jar cookiejar: cookie_jar, cookiefile: cookie_jar,
timeout: 2000, connecttimeout: 1000
} }
} }

View File

@@ -3,5 +3,6 @@
"user_agent_mode": "static", "user_agent_mode": "static",
"cache_ttl": 300, "cache_ttl": 300,
"request_timeout": 2000, "request_timeout": 2000,
"connect_timeout": 1000,
"max_threads": 5 "max_threads": 5
} }

View File

@@ -3,5 +3,6 @@
"user_agent_mode": "static", "user_agent_mode": "static",
"proxy": "127.0.0.1:3038", "proxy": "127.0.0.1:3038",
"cache_ttl": 300, "cache_ttl": 300,
"request_timeout": 2000 "request_timeout": 2000,
"connect_timeout": 1000
} }

View File

@@ -4,5 +4,6 @@
"proxy": "127.0.0.1:3038", "proxy": "127.0.0.1:3038",
"proxy_auth": "user:pass", "proxy_auth": "user:pass",
"cache_ttl": 300, "cache_ttl": 300,
"request_timeout": 2000 "request_timeout": 2000,
"connect_timeout": 1000
} }