From 68c96fad55fb13164e339426d7f1cbc88d4ccc8b Mon Sep 17 00:00:00 2001 From: Neeraj Singh Date: Thu, 29 Apr 2010 00:15:01 -0400 Subject: Fix form builder and form helpers inconsistencies [#4432 state:resolved] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * datetime_select and select_datetime should be consistent as much as possible * date_select and select_date should be consistent as much as possible * time_select and select_time should be consistent as much as possible Signed-off-by: José Valim --- actionpack/test/template/date_helper_test.rb | 101 +++++++++++++++++++++------ 1 file changed, 80 insertions(+), 21 deletions(-) (limited to 'actionpack/test/template') diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb index da2477b6f8..053fcc4d24 100644 --- a/actionpack/test/template/date_helper_test.rb +++ b/actionpack/test/template/date_helper_test.rb @@ -669,19 +669,11 @@ class DateHelperTest < ActionView::TestCase end def test_select_date_with_incomplete_order - # NOTE: modified this test because of minimal API change - expected = %(\n" - - expected << %(\n" - - expected << %(\n" - + # Since the order is incomplete nothing will be shown + expected = %(\n) + expected << %(\n) + expected << %(\n) + assert_dom_equal expected, select_date(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005, :prefix => "date[first]", :order => [:day]) end @@ -903,10 +895,14 @@ class DateHelperTest < ActionView::TestCase expected << %(\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n) expected << "\n" + expected << " — " + expected << %(\n" + expected << " : " + expected << %(\n" @@ -955,10 +951,14 @@ class DateHelperTest < ActionView::TestCase expected << %(\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n) expected << "\n" + expected << " — " + expected << %(\n" + expected << " : " + expected << %(\n" @@ -971,6 +971,7 @@ class DateHelperTest < ActionView::TestCase expected << %(\n\n\n) expected << "\n" + expected << %(\n" @@ -979,10 +980,14 @@ class DateHelperTest < ActionView::TestCase expected << %(\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n) expected << "\n" + expected << " — " + expected << %(\n" + expected << " : " + expected << %(\n" @@ -1039,10 +1044,14 @@ class DateHelperTest < ActionView::TestCase expected << %(\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n) expected << "\n" + expected << " — " + expected << %(\n" + expected << " : " + expected << %(\n" @@ -1065,10 +1074,14 @@ class DateHelperTest < ActionView::TestCase expected << %(\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n) expected << "\n" + expected << " — " + expected << %(\n" + expected << " : " + expected << %(\n" @@ -1078,10 +1091,16 @@ class DateHelperTest < ActionView::TestCase end def test_select_time - expected = %(\n) + expected << %(\n) + expected << %(\n) + + expected << %(\n" + expected << " : " + expected << %(\n" @@ -1091,7 +1110,10 @@ class DateHelperTest < ActionView::TestCase end def test_select_time_with_separator - expected = %(\n) + expected << %(\n) + expected << %(\n) + expected << %(\n" @@ -1106,14 +1128,22 @@ class DateHelperTest < ActionView::TestCase end def test_select_time_with_seconds - expected = %(\n) + expected << %(\n) + expected << %(\n) + + expected << %(\n" + expected << ' : ' + expected << %(\n" + expected << ' : ' + expected << %(\n" @@ -1122,7 +1152,11 @@ class DateHelperTest < ActionView::TestCase end def test_select_time_with_seconds_and_separator - expected = %(\n) + expected << %(\n) + expected << %(\n) + + expected << %(\n" @@ -1142,10 +1176,16 @@ class DateHelperTest < ActionView::TestCase end def test_select_time_with_html_options - expected = %(\n) + expected << %(\n) + expected << %(\n) + + expected << %(\n" + expected << " : " + expected << %(\n" @@ -1159,14 +1199,22 @@ class DateHelperTest < ActionView::TestCase end def test_select_time_with_default_prompt - expected = %(\n) + expected << %(\n) + expected << %(\n) + + expected << %(\n" + + expected << " : " expected << %(\n" + expected << " : " + expected << %(\n" @@ -1175,15 +1223,22 @@ class DateHelperTest < ActionView::TestCase end def test_select_time_with_custom_prompt - - expected = %(\n) + expected << %(\n) + expected << %(\n) + + expected << %(\n" + expected << " : " + expected << %(\n" + expected << " : " + expected << %(\n" @@ -2006,10 +2061,14 @@ class DateHelperTest < ActionView::TestCase expected << %(\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n) expected << "\n" + expected << " — " + expected << %(\n" + expected << " : " + expected << %(\n" -- cgit v1.2.3