More Whitespace!

This commit is contained in:
Jonas Nicklas 2010-01-01 22:46:05 +01:00
parent b096370c65
commit fe07c83f54
3 changed files with 27 additions and 27 deletions

View File

@ -36,46 +36,46 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base
# there has to be something better... # there has to be something better...
node.to_xml[/^\s*<([a-z0-9\-\:]+)/, 1] node.to_xml[/^\s*<([a-z0-9\-\:]+)/, 1]
end end
def visible? def visible?
node.visible? node.visible?
end end
def path def path
node.xpath node.xpath
end end
end end
attr_reader :app, :rack_server attr_reader :app, :rack_server
def initialize(app) def initialize(app)
@app = app @app = app
unless Capybara.app_host unless Capybara.app_host
@rack_server = Capybara::Server.new(@app) @rack_server = Capybara::Server.new(@app)
end end
end end
def visit(path) def visit(path)
browser.goto(url(path)) browser.goto(url(path))
end end
def current_url def current_url
browser.url browser.url
end end
def body def body
browser.html browser.html
end end
def response_headers def response_headers
browser.response_headers browser.response_headers
end end
def find(selector) def find(selector)
browser.elements_by_xpath(selector).map { |node| Node.new(self, node) } browser.elements_by_xpath(selector).map { |node| Node.new(self, node) }
end end
def wait?; true; end def wait?; true; end
def evaluate_script(script) def evaluate_script(script)
@ -87,7 +87,7 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base
require 'celerity' require 'celerity'
@_browser = ::Celerity::Browser.new(:browser => :firefox, :log_level => :off) @_browser = ::Celerity::Browser.new(:browser => :firefox, :log_level => :off)
end end
@_browser @_browser
end end

View File

@ -7,7 +7,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
def text def text
node.text node.text
end end
def [](name) def [](name)
value = node[name.to_s] value = node[name.to_s]
return value.to_s if value return value.to_s if value
@ -29,7 +29,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
node.content = value.to_s node.content = value.to_s
end end
end end
def select(option) def select(option)
node.xpath(".//option").each { |node| node.remove_attribute("selected") } node.xpath(".//option").each { |node| node.remove_attribute("selected") }
node.xpath(".//option[contains(.,'#{option}')]").first["selected"] = '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) Form.new(driver, form).submit(self)
end end
end end
def tag_name def tag_name
node.node_name node.node_name
end end
def visible? def visible?
node.xpath("./ancestor-or-self::*[contains(@style, 'display:none')]").size == 0 node.xpath("./ancestor-or-self::*[contains(@style, 'display:none')]").size == 0
end end
def path def path
node.path node.path
end end
private private
def type def type
self[:type] self[:type]
end end
@ -107,13 +107,13 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
def multipart? def multipart?
self[:enctype] == "multipart/form-data" self[:enctype] == "multipart/form-data"
end end
def post? def post?
self[:method] =~ /post/i self[:method] =~ /post/i
end end
private private
def merge_param!(params, key, value) def merge_param!(params, key, value)
collection = key.sub!(/\[\]$/, '') collection = key.sub!(/\[\]$/, '')
if collection if collection
@ -127,17 +127,17 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
end end
end end
end end
include ::Rack::Test::Methods include ::Rack::Test::Methods
attr_reader :app, :html, :body attr_reader :app, :html, :body
alias_method :response, :last_response alias_method :response, :last_response
alias_method :request, :last_request alias_method :request, :last_request
def initialize(app) def initialize(app)
@app = app @app = app
end end
def visit(path, attributes = {}) def visit(path, attributes = {})
get(path, attributes) get(path, attributes)
follow_redirect! while response.redirect? follow_redirect! while response.redirect?
@ -147,7 +147,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
def current_url def current_url
request.url request.url
end end
def response_headers def response_headers
response.headers response.headers
end end

View File

@ -42,7 +42,7 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
def tag_name def tag_name
node.tag_name node.tag_name
end end
def visible? def visible?
node.displayed? and node.displayed? != "false" node.displayed? and node.displayed? != "false"
end end
@ -95,7 +95,7 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
def evaluate_script(script) def evaluate_script(script)
browser.execute_script "return #{script}" browser.execute_script "return #{script}"
end end
def browser def browser
self.class.driver self.class.driver
end end