From fe07c83f54c3cbf2181963e23fa9ab012b98cf25 Mon Sep 17 00:00:00 2001 From: Jonas Nicklas Date: Fri, 1 Jan 2010 22:46:05 +0100 Subject: [PATCH] More Whitespace! --- lib/capybara/driver/celerity_driver.rb | 22 +++++++++---------- lib/capybara/driver/rack_test_driver.rb | 28 ++++++++++++------------- lib/capybara/driver/selenium_driver.rb | 4 ++-- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/capybara/driver/celerity_driver.rb b/lib/capybara/driver/celerity_driver.rb index 4d27c67f..ba1f1cbc 100644 --- a/lib/capybara/driver/celerity_driver.rb +++ b/lib/capybara/driver/celerity_driver.rb @@ -36,46 +36,46 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base # there has to be something better... node.to_xml[/^\s*<([a-z0-9\-\:]+)/, 1] end - + def visible? node.visible? end - + def path node.xpath end - + end attr_reader :app, :rack_server - + def initialize(app) @app = app unless Capybara.app_host @rack_server = Capybara::Server.new(@app) end end - + def visit(path) browser.goto(url(path)) end - + def current_url browser.url end - + def body browser.html end - + def response_headers browser.response_headers end - + def find(selector) browser.elements_by_xpath(selector).map { |node| Node.new(self, node) } end - + def wait?; true; end def evaluate_script(script) @@ -87,7 +87,7 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base require 'celerity' @_browser = ::Celerity::Browser.new(:browser => :firefox, :log_level => :off) end - + @_browser end diff --git a/lib/capybara/driver/rack_test_driver.rb b/lib/capybara/driver/rack_test_driver.rb index 677f9257..09cc2ddd 100644 --- a/lib/capybara/driver/rack_test_driver.rb +++ b/lib/capybara/driver/rack_test_driver.rb @@ -7,7 +7,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base def text node.text end - + def [](name) value = node[name.to_s] return value.to_s if value @@ -29,7 +29,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base node.content = value.to_s end end - + def select(option) node.xpath(".//option").each { |node| node.remove_attribute("selected") } node.xpath(".//option[contains(.,'#{option}')]").first["selected"] = 'selected' @@ -42,21 +42,21 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base Form.new(driver, form).submit(self) end end - + def tag_name node.node_name end - + def visible? node.xpath("./ancestor-or-self::*[contains(@style, 'display:none')]").size == 0 end - + def path node.path end - + private - + def type self[:type] end @@ -107,13 +107,13 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base def multipart? self[:enctype] == "multipart/form-data" end - + def post? self[:method] =~ /post/i end - + private - + def merge_param!(params, key, value) collection = key.sub!(/\[\]$/, '') if collection @@ -127,17 +127,17 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base end end end - + include ::Rack::Test::Methods attr_reader :app, :html, :body alias_method :response, :last_response alias_method :request, :last_request - + def initialize(app) @app = app end - + def visit(path, attributes = {}) get(path, attributes) follow_redirect! while response.redirect? @@ -147,7 +147,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base def current_url request.url end - + def response_headers response.headers end diff --git a/lib/capybara/driver/selenium_driver.rb b/lib/capybara/driver/selenium_driver.rb index 4842f3cc..2c147450 100644 --- a/lib/capybara/driver/selenium_driver.rb +++ b/lib/capybara/driver/selenium_driver.rb @@ -42,7 +42,7 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base def tag_name node.tag_name end - + def visible? node.displayed? and node.displayed? != "false" end @@ -95,7 +95,7 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base def evaluate_script(script) browser.execute_script "return #{script}" end - + def browser self.class.driver end