diff --git a/lib/capybara.rb b/lib/capybara.rb index 70f7acfb..b4e7da5f 100644 --- a/lib/capybara.rb +++ b/lib/capybara.rb @@ -29,8 +29,6 @@ module Capybara module Driver autoload :RackTest, 'capybara/driver/rack_test_driver' autoload :Culerity, 'capybara/driver/culerity_driver' - autoload :SafariWatir, 'capybara/driver/safariwatir_driver' - autoload :FireWatir, 'capybara/driver/firewatir_driver' autoload :Selenium, 'capybara/driver/selenium_driver' end end diff --git a/lib/capybara/driver/firewatir_driver.rb b/lib/capybara/driver/firewatir_driver.rb deleted file mode 100644 index a6c21c88..00000000 --- a/lib/capybara/driver/firewatir_driver.rb +++ /dev/null @@ -1,66 +0,0 @@ -require 'watir' -Watir::Browser.default = "firefox" - -class Capybara::Driver::FireWatir - class Node < Struct.new(:node) - def text - node.text - end - - def attribute(name) - value = if name.to_sym == :class - node.class_name - else - node.send(name.to_sym) - end - return value if value and not value.empty? - end - - def click - node.click - end - - def tag_name - # FIXME: this might be the dumbest way ever of getting the tag name - # there has to be something better... - node.to_xml[/^\s*<([a-z0-9\-\:]+)/, 1] - end - end - - attr_reader :app, :rack_server - - def initialize(app) - @app = app - @rack_server = Capybara::Server.new(@app) - @rack_server.boot - end - - def visit(path) - browser.goto(url(path)) - end - - def body - browser.html - end - - def find(selector) - browser.elements_by_xpath(selector).map { |node| Node.new(node) } - end - -private - - def url(path) - rack_server.url(path) - end - - def browser - unless @_browser - @_browser = Watir::Browser.new - at_exit do - @_browser.exit - end - end - @_browser - end - -end \ No newline at end of file diff --git a/lib/capybara/driver/safariwatir_driver.rb b/lib/capybara/driver/safariwatir_driver.rb deleted file mode 100644 index 9342908e..00000000 --- a/lib/capybara/driver/safariwatir_driver.rb +++ /dev/null @@ -1,67 +0,0 @@ -require 'safariwatir' - -class Capybara::Driver::SafariWatir - class Node < Struct.new(:node) - def text - node.text - end - - def attribute(name) - value = if name.to_sym == :class - node.class_name - else - node.send(name.to_sym) - end - return value if value and not value.empty? - end - - def click - node.click - end - - def tag_name - # FIXME: this might be the dumbest way ever of getting the tag name - # there has to be something better... - node.to_xml[/^\s*<([a-z0-9\-\:]+)/, 1] - end - end - - attr_reader :app, :rack_server - - def initialize(app) - @app = app - @rack_server = Capybara::Server.new(@app) - @rack_server.boot - end - - def visit(path) - browser.goto(url(path)) - end - - def body - browser.html - end - - def find(selector) - foo = Struct.new(:what).new - foo.what = selector - browser.send(:scripter).operate_by_xpath(foo){}.map { |node| Node.new(node) } - end - -private - - def url(path) - rack_server.url(path) - end - - def browser - unless @_browser - @_browser = Watir::Safari.new - at_exit do - @_browser.exit - end - end - @_browser - end - -end diff --git a/spec/driver/firewatir_driver_spec.rb b/spec/driver/firewatir_driver_spec.rb deleted file mode 100644 index 709085d8..00000000 --- a/spec/driver/firewatir_driver_spec.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.expand_path('../spec_helper', File.dirname(__FILE__)) - -# describe Capybara::Driver::FireWatir do -# before do -# @driver = Capybara::Driver::FireWatir.new(TestApp) -# end -# -# it_should_behave_like "driver" -# it_should_behave_like "driver with javascript support" -# end diff --git a/spec/driver/safariwarit_driver_spec.rb b/spec/driver/safariwarit_driver_spec.rb deleted file mode 100644 index 8c19eb6b..00000000 --- a/spec/driver/safariwarit_driver_spec.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.expand_path('../spec_helper', File.dirname(__FILE__)) - -# describe Capybara::Driver::SafariWatir do -# before do -# @driver = Capybara::Driver::SafariWatir.new(TestApp) -# end -# -# it_should_behave_like "driver" -# it_should_behave_like "driver with javascript support" -# end