Move and rename Selenium driver class

lib/capybara.rb

@@ -199,7 +199,6 @@ module Capybara
   module Driver
     autoload :Base,     'capybara/driver/base'
     autoload :Node,     'capybara/driver/node'
-    autoload :Selenium, 'capybara/driver/selenium_driver'
   end
 
   module RackTest
@@ -208,6 +207,11 @@ module Capybara
     autoload :Form,    'capybara/rack_test/form'
     autoload :Browser, 'capybara/rack_test/browser'
   end
+
+  module Selenium
+    autoload :Node,    'capybara/selenium/node'
+    autoload :Driver,  'capybara/selenium/driver'
+  end
 end
 
 Capybara.configure do |config|
@@ -226,5 +230,5 @@ Capybara.register_driver :rack_test do |app|
 end
 
 Capybara.register_driver :selenium do |app|
-  Capybara::Driver::Selenium.new(app)
+  Capybara::Selenium::Driver.new(app)
 end

lib/capybara/selenium/driver.rb

@@ -1,6 +1,6 @@
 require 'selenium-webdriver'
 
-class Capybara::Driver::Selenium < Capybara::Driver::Base
+class Capybara::Selenium::Driver < Capybara::Driver::Base
   DEFAULT_OPTIONS = {
     :resynchronize => true,
     :resynchronization_timeout => 10,
@@ -8,98 +8,6 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
   }
   SPECIAL_OPTIONS = [:browser, :resynchronize, :resynchronization_timeout]
 
-  class Node < Capybara::Driver::Node
-    def text
-      native.text
-    end
-
-    def [](name)
-      if name == :value
-        value
-      else
-        native.attribute(name.to_s)
-      end
-    rescue Selenium::WebDriver::Error::WebDriverError
-      nil
-    end
-
-    def value
-      if tag_name == "select" and self[:multiple] and not self[:multiple] == "false"
-        native.find_elements(:xpath, ".//option").select { |n| n.selected? }.map { |n| n.value || n.text }
-      else
-        native.value
-      end
-    end
-
-    def set(value)
-      if tag_name == 'input' and type == 'radio'
-        click
-      elsif tag_name == 'input' and type == 'checkbox'
-        click if value ^ native.attribute('checked').to_s.eql?("true")
-      elsif tag_name == 'textarea' or tag_name == 'input'
-        resynchronize do
-          native.clear
-          native.send_keys(value.to_s)
-        end
-      end
-    end
-
-    def select_option
-      resynchronize { native.select }
-    end
-
-    def unselect_option
-      if select_node['multiple'] != 'multiple' and select_node['multiple'] != 'true'
-        raise Capybara::UnselectNotAllowed, "Cannot unselect option from single select box."
-      end
-      resynchronize { native.toggle } if selected?
-    end
-
-    def click
-      resynchronize { native.click }
-    end
-
-    def drag_to(element)
-      resynchronize { native.drag_and_drop_on(element.native) }
-    end
-
-    def tag_name
-      native.tag_name
-    end
-
-    def visible?
-      displayed = native.displayed?
-      displayed and displayed != "false"
-    end
-
-    def selected?
-      selected = native.selected?
-      selected and selected != "false"
-    end
-
-    alias :checked? :selected?
-
-    def find(locator)
-      native.find_elements(:xpath, locator).map { |n| self.class.new(driver, n) }
-    end
-
-  private
-
-    def resynchronize
-      driver.resynchronize { yield }
-    end
-
-    # a reference to the select node if this is an option node
-    def select_node
-      find('./ancestor::select').first
-    end
-
-    def type
-      self[:type]
-    end
-
-  end
-
   attr_reader :app, :rack_server, :options
 
   def browser
@@ -136,7 +44,7 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
   end
 
   def find(selector)
-    browser.find_elements(:xpath, selector).map { |node| Node.new(self, node) }
+    browser.find_elements(:xpath, selector).map { |node| Capybara::Selenium::Node.new(self, node) }
   end
 
   def wait?; true; end

lib/capybara/selenium/node.rb

@@ -0,0 +1,91 @@
+class Capybara::Selenium::Node < Capybara::Driver::Node
+  def text
+    native.text
+  end
+
+  def [](name)
+    if name == :value
+      value
+    else
+      native.attribute(name.to_s)
+    end
+  rescue Selenium::WebDriver::Error::WebDriverError
+    nil
+  end
+
+  def value
+    if tag_name == "select" and self[:multiple] and not self[:multiple] == "false"
+      native.find_elements(:xpath, ".//option").select { |n| n.selected? }.map { |n| n.value || n.text }
+    else
+      native.value
+    end
+  end
+
+  def set(value)
+    if tag_name == 'input' and type == 'radio'
+      click
+    elsif tag_name == 'input' and type == 'checkbox'
+      click if value ^ native.attribute('checked').to_s.eql?("true")
+    elsif tag_name == 'textarea' or tag_name == 'input'
+      resynchronize do
+        native.clear
+        native.send_keys(value.to_s)
+      end
+    end
+  end
+
+  def select_option
+    resynchronize { native.select }
+  end
+
+  def unselect_option
+    if select_node['multiple'] != 'multiple' and select_node['multiple'] != 'true'
+      raise Capybara::UnselectNotAllowed, "Cannot unselect option from single select box."
+    end
+    resynchronize { native.toggle } if selected?
+  end
+
+  def click
+    resynchronize { native.click }
+  end
+
+  def drag_to(element)
+    resynchronize { native.drag_and_drop_on(element.native) }
+  end
+
+  def tag_name
+    native.tag_name
+  end
+
+  def visible?
+    displayed = native.displayed?
+    displayed and displayed != "false"
+  end
+
+  def selected?
+    selected = native.selected?
+    selected and selected != "false"
+  end
+
+  alias :checked? :selected?
+
+  def find(locator)
+    native.find_elements(:xpath, locator).map { |n| self.class.new(driver, n) }
+  end
+
+private
+
+  def resynchronize
+    driver.resynchronize { yield }
+  end
+
+  # a reference to the select node if this is an option node
+  def select_node
+    find('./ancestor::select').first
+  end
+
+  def type
+    self[:type]
+  end
+
+end

spec/driver/remote_selenium_driver_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe Capybara::Driver::Selenium do
-  before do
-    #Capybara.app_host = "http://capybara-testapp.heroku.com"
-    @driver = TestSessions::Selenium.driver
-  end
-
-  after do
-    Capybara.app_host = nil
-  end
-
-  it_should_behave_like "driver"
-  it_should_behave_like "driver with javascript support"
-  it_should_behave_like "driver without status code support"
-end

spec/driver/selenium_driver_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Capybara::Driver::Selenium do
+describe Capybara::Selenium::Driver do
   before do
     @driver = TestSessions::Selenium.driver
   end

spec/session/selenium_session_spec.rb

@@ -8,7 +8,7 @@ describe Capybara::Session do
 
     describe '#driver' do
       it "should be a selenium driver" do
-        @session.driver.should be_an_instance_of(Capybara::Driver::Selenium)
+        @session.driver.should be_an_instance_of(Capybara::Selenium::Driver)
       end
     end