Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Small improvements/cleanup.

Browse source
This commit is contained in:
Martin Edenhofer 2013-02-24 00:33:30 +01:00
parent 63ffdbf62a
commit 7a2fe91c27
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
test/browser_test_helper.rb
View file

@ -14,27 +14,36 @@ class TestCase < Test::Unit::TestCase
@browsers = [] @browsers = []
end end
if !ENV['REMOTE_URL'] if !ENV['REMOTE_URL']
browser = Selenium::WebDriver.for :firefox if !ENV['BROWSER']
ENV['BROWSER'] = 'firefox'
end
browser = Selenium::WebDriver.for( ENV['BROWSER'].to_sym )
@browsers.push browser @browsers.push browser
return browser return browser
end end
# return Watir::Browser.new if !ENV['REMOTE_URL']
caps = Selenium::WebDriver::Remote::Capabilities.send( ENV['BROWSER'] ) caps = Selenium::WebDriver::Remote::Capabilities.send( ENV['BROWSER'] )
caps.platform = ENV['BROWSER_OS'] || 'Windows 2008' caps.platform = ENV['BROWSER_OS'] || 'Windows 2008'
caps.version = ENV['BROWSER_VERSION'] || '8' caps.version = ENV['BROWSER_VERSION'] || '8'
Selenium::WebDriver.for( browser = Selenium::WebDriver.for(
:remote, :remote,
:url => ENV['REMOTE_URL'], :url => ENV['REMOTE_URL'],
:desired_capabilities => caps, :desired_capabilities => caps,
) )
@browsers.push browser
return browser
end end
def teardown def teardown
return if !@browsers return if !@browsers
# only shut down browser type once
# otherwise this error will happen "Errno::ECONNREFUSED: Connection refused - connect(2)"
shutdown = {}
@browsers.each{ |browser| @browsers.each{ |browser|
browser.close next if shutdown[ browser.browser ]
shutdown[ browser.browser ] = true
browser.quit
} }
end end