Use explicit require instead of autoload

For thread safety reasons

lib/capybara.rb

@@ -287,54 +287,38 @@ module Capybara
   self.default_driver = nil
   self.current_driver = nil
 
-  autoload :DSL,        'capybara/dsl'
-  autoload :Server,     'capybara/server'
-  autoload :Session,    'capybara/session'
-  autoload :Selector,   'capybara/selector'
-  autoload :Query,      'capybara/query'
-  autoload :Result,     'capybara/result'
-  autoload :Helpers,    'capybara/helpers'
-  autoload :VERSION,    'capybara/version'
+  module Driver; end
+  module RackTest; end
+  module Selenium; end
 
-  module Node
-    autoload :Base,       'capybara/node/base'
-    autoload :Simple,     'capybara/node/simple'
-    autoload :Element,    'capybara/node/element'
-    autoload :Document,   'capybara/node/document'
-    autoload :Finders,    'capybara/node/finders'
-    autoload :Matchers,   'capybara/node/matchers'
-    autoload :Actions,    'capybara/node/actions'
-  end
+  require 'capybara/session'
+  require 'capybara/dsl'
+  require 'capybara/server'
+  require 'capybara/selector'
+  require 'capybara/query'
+  require 'capybara/result'
+  require 'capybara/helpers'
+  require 'capybara/version'
 
-  module Driver
-    autoload :Base,     'capybara/driver/base'
-    autoload :Node,     'capybara/driver/node'
+  require 'capybara/node/finders'
+  require 'capybara/node/matchers'
+  require 'capybara/node/actions'
+  require 'capybara/node/simple'
+  require 'capybara/node/base'
+  require 'capybara/node/element'
+  require 'capybara/node/document'
 
-    class Selenium
-      def initialize(*args)
-        raise "Capybara::Driver::Selenium has been renamed to Capybara::Selenium::Driver"
-      end
-    end
+  require 'capybara/driver/base'
+  require 'capybara/driver/node'
 
-    class RackTest
-      def initialize(*args)
-        raise "Capybara::Driver::RackTest has been renamed to Capybara::RackTest::Driver"
-      end
-    end
-  end
+  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'
 
-  module RackTest
-    autoload :Driver,  'capybara/rack_test/driver'
-    autoload :Node,    'capybara/rack_test/node'
-    autoload :Form,    'capybara/rack_test/form'
-    autoload :Browser, 'capybara/rack_test/browser'
-    autoload :CSSHandlers, 'capybara/rack_test/css_handlers.rb'
-  end
-
-  module Selenium
-    autoload :Node,    'capybara/selenium/node'
-    autoload :Driver,  'capybara/selenium/driver'
-  end
+  require 'capybara/selenium/node'
+  require 'capybara/selenium/driver'
 end
 
 Capybara.configure do |config|