Skip to content
Browse files

Revert "Delay requiring selenium until driver is used, closes #1018"

This reverts commit 07f2a71.
  • Loading branch information...
1 parent c43cbb3 commit a95518e6c2517c97c0d523daaabd86a1b028e72d @jnicklas committed Mar 18, 2013
Showing with 9 additions and 9 deletions.
  1. +9 −9 lib/capybara.rb
View
18 lib/capybara.rb
@@ -310,6 +310,15 @@ module Selenium; end
require 'capybara/driver/base'
require 'capybara/driver/node'
+
+ require 'capybara/rack_test/driver'
+ require 'capybara/rack_test/node'
+ require 'capybara/rack_test/form'
+ require 'capybara/rack_test/browser'
+ require 'capybara/rack_test/css_handlers.rb'
+
+ require 'capybara/selenium/node'
+ require 'capybara/selenium/driver'
end
Capybara.configure do |config|
@@ -328,18 +337,9 @@ module Selenium; end
end
Capybara.register_driver :rack_test do |app|
- require 'capybara/rack_test/driver'
- require 'capybara/rack_test/node'
- require 'capybara/rack_test/form'
- require 'capybara/rack_test/browser'
- require 'capybara/rack_test/css_handlers.rb'
-
Capybara::RackTest::Driver.new(app)
end
Capybara.register_driver :selenium do |app|
- require 'capybara/selenium/node'
- require 'capybara/selenium/driver'
-
Capybara::Selenium::Driver.new(app)
end

0 comments on commit a95518e

Please sign in to comment.
Something went wrong with that request. Please try again.