Delay loading selenium until driver in instantiated

Another attempt at fixing #1018
This commit is contained in:
Jonas Nicklas 2013-03-18 23:43:48 +01:00
parent a95518e6c2
commit 4772f509f8
1 changed files with 10 additions and 11 deletions

View File

@ -1,14 +1,3 @@
begin
require 'selenium-webdriver'
rescue LoadError => e
if e.message =~ /selenium-webdriver/
raise LoadError, "Capybara's selenium driver is unable to load `selenium-webdriver`, please install the gem and add `gem 'selenium-webdriver'` to your Gemfile if you are using bundler."
else
raise e
end
end
class Capybara::Selenium::Driver < Capybara::Driver::Base
DEFAULT_OPTIONS = {
:browser => :firefox
@ -33,6 +22,16 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
end
def initialize(app, options={})
begin
require 'selenium-webdriver'
rescue LoadError => e
if e.message =~ /selenium-webdriver/
raise LoadError, "Capybara's selenium driver is unable to load `selenium-webdriver`, please install the gem and add `gem 'selenium-webdriver'` to your Gemfile if you are using bundler."
else
raise e
end
end
@app = app
@browser = nil
@exit_status = nil