Merge remote branch 'badcarl/add_multiple_select'

This commit is contained in:
Jonas Nicklas 2010-02-20 03:30:32 +01:00
commit de1bcd31d1
1 changed files with 19 additions and 0 deletions

View File

@ -7,6 +7,8 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base
def [](name)
value = if name.to_sym == :class
node.class_name
elsif node.type == 'select-multiple'
return node.selected_options
else
node.send(name.to_sym)
end
@ -24,6 +26,23 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base
raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
end
def unselect(option)
unless node.multiple?
raise Capybara::UnselectNotAllowed, "Cannot unselect option '#{option}' from single select box."
end
# FIXME: couldn't find a clean way to unselect, so clear and reselect
selected_options = node.selected_options
if unselect_option = selected_options.detect { |value| value == option } ||
selected_options.detect { |value| value.index(option) }
node.clear
(selected_options - [unselect_option]).each { |value| node.select_value(value) }
else
options = all(:xpath, "//option").map { |o| "'#{o.text}'" }.join(', ')
raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
end
end
def click
node.click
end