diff --git a/lib/capybara/selenium/driver.rb b/lib/capybara/selenium/driver.rb index bd3a0c40..9941eeaf 100644 --- a/lib/capybara/selenium/driver.rb +++ b/lib/capybara/selenium/driver.rb @@ -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