kotovalexarian-likes-github/teamcapybara--capybara
1
0
Fork 0
mirror of https://github.com/teamcapybara/capybara.git synced 2022-11-09 12:08:07 -05:00
Code Releases Activity

Refactor of form submission to let rack-test do more work itself.

Browse source
This commit is contained in:
Rob Holland 2009-12-04 14:51:51 +00:00
parent 0f5f698194
commit b4cde1794e
1 changed files with 33 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

70
lib/capybara/driver/rack_test_driver.rb
View file

@ -60,57 +60,39 @@ class Capybara::Driver::RackTest
class Form < Node
def params(button)
params = []
inputs = node.xpath(".//input[@type='text']", ".//input[@type='hidden']", ".//input[@type='password']").map do |input|
[input['name'].to_s, input['value'].to_s]
params = {}
node.xpath(".//input[@type='text' or @type='hidden' or @type='password']").map do |input|
merge_param!(params, input['name'].to_s, input['value'].to_s)
end
params.concat(inputs)
inputs = node.xpath(".//textarea").map do |textarea|
[textarea['name'].to_s, textarea.text.to_s]
node.xpath(".//textarea").map do |textarea|
merge_param!(params, textarea['name'].to_s, textarea.text.to_s)
end
params.concat(inputs)
inputs = node.xpath(".//input[@type='radio']").map do |input|
[input['name'].to_s, input['value'].to_s] if input['checked']
node.xpath(".//input[@type='radio' or @type='checkbox']").map do |input|
merge_param!(params, input['name'].to_s, input['value'].to_s) if input['checked']
end
params.concat(inputs)
inputs = node.xpath(".//input[@type='checkbox']").map do |input|
[input['name'].to_s, input['value'].to_s] if input['checked']
end
params.concat(inputs)
inputs = node.xpath(".//select").map do |select|
node.xpath(".//select").map do |select|
option = select.xpath(".//option[@selected]").first
option ||= select.xpath('.//option').first
option ? [select['name'].to_s, (option['value'] || option.text).to_s] : nil
merge_param!(params, select['name'].to_s, (option['value'] || option.text).to_s) if option
end
params.concat(inputs)
inputs = node.xpath(".//input[@type='file']").map do |input|
node.xpath(".//input[@type='file']").map do |input|
if input['value'].to_s.any?
if multipart?
[input['name'].to_s, Rack::Test::UploadedFile.new(input['value'].to_s)]
merge_param!(params, input['name'].to_s, Rack::Test::UploadedFile.new(input['value'].to_s))
else
[input['name'].to_s, File.basename(input['value'].to_s)]
merge_param!(params, input['name'].to_s, File.basename(input['value'].to_s))
end
end
end
params.concat(inputs)
params.compact!
params.push [button[:name], button[:value]] if button[:name]
if multipart?
Hash[
params.map do |key, value|
[key, value.is_a?(String) ? CGI.escape(value.to_s) : value]
end
]
else
params.map { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
end
merge_param!(params, button[:name], button[:value]) if button[:name]
params
end
def submit(button)
if post?
driver.submit(node['action'].to_s, params(button))
else
driver.visit(node['action'].to_s.split('?').first + '?' + params(button))
driver.visit(node['action'].to_s, params(button))
end
end
@ -121,6 +103,20 @@ class Capybara::Driver::RackTest
def post?
self[:method] =~ /post/i
end
private
def merge_param!(params, key, value)
collection = key.sub!(/\[\]$/, '')
case params[key]
when nil
params[key] = collection ? [value] : value
when Array
params[key] << value
else
params[key] = [params[key], value]
end
end
end
include ::Rack::Test::Methods
@ -133,8 +129,8 @@ class Capybara::Driver::RackTest
@app = app
end
def visit(path)
get(path)
def visit(path, attributes = {})
get(path, attributes)
follow_redirect! while response.redirect?
cache_body
end
@ -142,9 +138,9 @@ class Capybara::Driver::RackTest
def submit(path, attributes)
post(path, attributes)
follow_redirect! while response.redirect?
cache_body
cache_body
end
def find(selector)
html.xpath(selector).map { |node| Node.new(self, node) }
end