aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-03 08:02:14 -0700
committerJosé Valim <jose.valim@gmail.com>2011-05-03 08:02:14 -0700
commitdd7afdb2dc95a934df50c72b36ba6c80b5ac4944 (patch)
tree6a5365c7ee27cf64c51d09b913bad4e15f1e29c4 /actionpack/test
parentf9849070acb4c7df0b60c61cea3a927191851e92 (diff)
parentc5d54be746473ce5610e5e6de51f6b9d2495c935 (diff)
downloadrails-dd7afdb2dc95a934df50c72b36ba6c80b5ac4944.tar.gz
rails-dd7afdb2dc95a934df50c72b36ba6c80b5ac4944.tar.bz2
rails-dd7afdb2dc95a934df50c72b36ba6c80b5ac4944.zip
Merge pull request #378 from danielvlopes/master.
Select_tag should have the same API of select from form_builder
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/template/form_tag_helper_test.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 656fa0356b..f95308b847 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -200,12 +200,18 @@ class FormTagHelperTest < ActionView::TestCase
assert_dom_equal expected, actual
end
- def test_select_tag_with_include_blank_with_string
- actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, :include_blank => "string"
+ def test_select_tag_with_prompt
+ actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, :prompt => "string"
expected = %(<select id="places" name="places"><option value="">string</option><option>Home</option><option>Work</option><option>Pub</option></select>)
assert_dom_equal expected, actual
end
+ def test_select_tag_with_prompt_and_include_blank
+ actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, :prompt => "string", :include_blank => true
+ expected = %(<select name="places" id="places"><option value="">string</option><option value=""></option><option>Home</option><option>Work</option><option>Pub</option></select>)
+ assert_dom_equal expected, actual
+ end
+
def test_text_area_tag_size_string
actual = text_area_tag "body", "hello world", "size" => "20x40"
expected = %(<textarea cols="20" id="body" name="body" rows="40">hello world</textarea>)