github-migration/webrat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added default form values for select menus.

Browse Source
This commit is contained in:
Luke Melia 2008-03-12 02:04:41 -04:00
parent f7420463fd
commit 9fe0ef33af
3 changed files with 61 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/webrat/session.rb
View File

@ -377,30 +377,25 @@ module ActionController
add_default_params_from_checkboxes_for(form)
add_default_params_from_radio_buttons_for(form)
add_default_params_from_textareas_for(form)
add_default_params_from_selects_for(form)
end
def add_default_params_from_inputs_for(form) # :nodoc:
(form / "input").each do |input|
next if input.attributes["value"].blank? || !%w[text hidden].include?(input.attributes["type"])
((form / "input[@type='text']") + (form / "input[@type='hidden']")).each do |input|
next if input.attributes["value"].blank?
add_form_data(input, input.attributes["value"])
end
end
def add_default_params_from_checkboxes_for(form) # :nodoc:
(form / "input").each do |input|
next if input.attributes["type"] != "checkbox"
if input.attributes["checked"] == "checked"
add_form_data(input, input.attributes["value"] || "on")
end
(form / "input[@type='checkbox][@checked='checked']").each do |input|
add_form_data(input, input.attributes["value"] || "on")
end
end
def add_default_params_from_radio_buttons_for(form) # :nodoc:
(form / "input").each do |input|
next if input.attributes["type"] != "radio"
if input.attributes["checked"] == "checked"
add_form_data(input, input.attributes["value"])
end
(form / "input[@type='radio][@checked='checked']").each do |input|
add_form_data(input, input.attributes["value"])
end
end
@ -410,6 +405,16 @@ module ActionController
end
end
def add_default_params_from_selects_for(form) # :nodoc:
(form / "select").each do |select|
selected_options = select / "option[@selected='selected']"
selected_options = select / "option:first" if selected_options.empty?
selected_options.each do |option|
add_form_data(select, option.attributes["value"] || option.innerHTML)
end
end
end
def form_for_node(node) # :nodoc:
return node if node.name == "form"
node = node.parent until node.name == "form"

42
test/clicks_button_test.rb
View File

@ -219,6 +219,48 @@ class ClicksButtonTest < Test::Unit::TestCase
@session.clicks_button
end
def test_should_send_default_selected_option_value_from_select
@response.stubs(:body).returns(<<-EOS)
<form method="get" action="/login">
<select name="month">
<option value="1">January</option>
<option value="2" selected="selected">February</option>
</select>
<input type="submit" />
</form>
EOS
@session.expects(:get_via_redirect).with("/login", "month" => "2")
@session.clicks_button
end
def test_should_send_default_selected_option_inner_html_from_select_when_no_value_attribute
@response.stubs(:body).returns(<<-EOS)
<form method="get" action="/login">
<select name="month">
<option>January</option>
<option selected="selected">February</option>
</select>
<input type="submit" />
</form>
EOS
@session.expects(:get_via_redirect).with("/login", "month" => "February")
@session.clicks_button
end
def test_should_send_first_select_option_value_when_no_option_selected
@response.stubs(:body).returns(<<-EOS)
<form method="get" action="/login">
<select name="month">
<option value="1">January</option>
<option value="2">February</option>
</select>
<input type="submit" />
</form>
EOS
@session.expects(:get_via_redirect).with("/login", "month" => "1")
@session.clicks_button
end
def test_should_handle_nested_properties
@response.stubs(:body).returns(<<-EOS)
<form method="post" action="/login">

4
test/selects_test.rb
View File

@ -59,7 +59,7 @@ class SelectsTest < Test::Unit::TestCase
<input type="submit" />
</form>
EOS
@session.expects(:post_via_redirect).with("/login", "end_month" => "e1")
@session.expects(:post_via_redirect).with("/login", "start_month" => "s1", "end_month" => "e1")
@session.selects "January", :from => "end_month"
@session.clicks_button
end
@ -74,7 +74,7 @@ class SelectsTest < Test::Unit::TestCase
<input type="submit" />
</form>
EOS
@session.expects(:post_via_redirect).with("/login", "end_month" => "e1")
@session.expects(:post_via_redirect).with("/login", "start_month" => "s1", "end_month" => "e1")
@session.selects "January", :from => "End Month"
@session.clicks_button
end