Navigation

← Previous Changeset
Next Changeset →

Changeset 8911

Timestamp:

02/20/08 04:23:18 (11 months ago)

Author:

nzkoz

Message:

Make date_helper use tag and content_tag. Move to assert_dom_equal instead of assert_equal to avoid being dependent on hash ordering. Closes #11131 [ernesto.jimenez]

Files:

trunk/actionpack/lib/action_view/helpers/date_helper.rb (modified) (9 diffs)
trunk/actionpack/test/template/date_helper_test.rb (modified) (82 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/actionpack/lib/action_view/helpers/date_helper.rb

r8467	r8911
1	1	require "date"
	2	require 'action_view/helpers/tag_helper'
2	3
3	4	module ActionView
…	…
12	13	# method would use simply "date" (which can be overwritten using <tt>:prefix</tt>) instead of "date[month]".
13	14	module DateHelper
	15	include ActionView::Helpers::TagHelper
14	16	DEFAULT_PREFIX = 'date' unless const_defined?('DEFAULT_PREFIX')
15	17
…	…
338	340	0.upto(59) do \|second\|
339	341	second_options << ((val == second) ?
340		~~%(<option value="#{leading_zero_on_single_digits(second)}" selected="selected">#{leading_zero_on_single_digits(second)}</option>\n~~) :
341		~~%(<option value="#{leading_zero_on_single_digits(second)}">#{leading_zero_on_single_digits(second)}</option>\n~~)
	342	content_tag(:option, leading_zero_on_single_digits(second), :value => leading_zero_on_single_digits(second), :selected => "selected") :
	343	content_tag(:option, leading_zero_on_single_digits(second), :value => leading_zero_on_single_digits(second))
342	344	)
	345	second_options << "\n"
343	346	end
344	347	select_html(options[:field_name] \|\| 'second', second_options.join, options)
…	…
372	375	0.step(59, options[:minute_step] \|\| 1) do \|minute\|
373	376	minute_options << ((val == minute) ?
374		~~%(<option value="#{leading_zero_on_single_digits(minute)}" selected="selected">#{leading_zero_on_single_digits(minute)}</option>\n~~) :
375		~~%(<option value="#{leading_zero_on_single_digits(minute)}">#{leading_zero_on_single_digits(minute)}</option>\n~~)
	377	content_tag(:option, leading_zero_on_single_digits(minute), :value => leading_zero_on_single_digits(minute), :selected => "selected") :
	378	content_tag(:option, leading_zero_on_single_digits(minute), :value => leading_zero_on_single_digits(minute))
376	379	)
	380	minute_options << "\n"
377	381	end
378	382	select_html(options[:field_name] \|\| 'minute', minute_options.join, options)
…	…
405	409	0.upto(23) do \|hour\|
406	410	hour_options << ((val == hour) ?
407		~~%(<option value="#{leading_zero_on_single_digits(hour)}" selected="selected">#{leading_zero_on_single_digits(hour)}</option>\n~~) :
408		~~%(<option value="#{leading_zero_on_single_digits(hour)}">#{leading_zero_on_single_digits(hour)}</option>\n~~)
	411	content_tag(:option, leading_zero_on_single_digits(hour), :value => leading_zero_on_single_digits(hour), :selected => "selected") :
	412	content_tag(:option, leading_zero_on_single_digits(hour), :value => leading_zero_on_single_digits(hour))
409	413	)
	414	hour_options << "\n"
410	415	end
411	416	select_html(options[:field_name] \|\| 'hour', hour_options.join, options)
…	…
438	443	1.upto(31) do \|day\|
439	444	day_options << ((val == day) ?
440		~~%(<option value="#{day}" selected="selected">#{day}</option>\n~~) :
441		~~%(<option value="#{day}">#{day}</option>\n~~)
	445	content_tag(:option, day, :value => day, :selected => "selected") :
	446	content_tag(:option, day, :value => day)
442	447	)
	448	day_options << "\n"
443	449	end
444	450	select_html(options[:field_name] \|\| 'day', day_options.join, options)
…	…
498	504
499	505	month_options << ((val == month_number) ?
500		~~%(<option value="#{month_number}" selected="selected">#{month_name}</option>\n~~) :
501		~~%(<option value="#{month_number}">#{month_name}</option>\n~~)
	506	content_tag(:option, month_name, :value => month_number, :selected => "selected") :
	507	content_tag(:option, month_name, :value => month_number)
502	508	)
	509	month_options << "\n"
503	510	end
504	511	select_html(options[:field_name] \|\| 'month', month_options.join, options)
…	…
540	547	start_year.step(end_year, step_val) do \|year\|
541	548	year_options << ((val == year) ?
542		~~%(<option value="#{year}" selected="selected">#{year}</option>\n~~) :
543		~~%(<option value="#{year}">#{year}</option>\n~~)
	549	content_tag(:option, year, :value => year, :selected => "selected") :
	550	content_tag(:option, year, :value => year)
544	551	)
	552	year_options << "\n"
545	553	end
546	554	select_html(options[:field_name] \|\| 'year', year_options.join, options)
…	…
552	560	def select_html(type, html_options, options)
553	561	name_and_id_from_options(options, type)
554		select_~~html = %(<select id="#{options[:id]}" name="#{options[:name]}")~~
555		select_~~html << %( disabled="disabled"~~) if options[:disabled]
556		select_html ~~<< %(>\n)~~
557		select_html << ~~%(<option value=""></option>\n)~~ if options[:include_blank]
	562	select_options = {:id => options[:id], :name => options[:name]}
	563	select_options.merge!(:disabled => 'disabled') if options[:disabled]
	564	select_html = "\n"
	565	select_html << content_tag(:option, '', :value => '') + "\n" if options[:include_blank]
558	566	select_html << html_options.to_s
559		~~select_html << "</select>~~\n"
	567	content_tag(:select, select_html, select_options) + "\n"
560	568	end
561	569
562	570	def hidden_html(type, value, options)
563	571	name_and_id_from_options(options, type)
564		hidden_html = ~~%(<input type="hidden" id="#{options[:id]}" name="#{options[:name]}" value="#{value}" />\n)~~
	572	hidden_html = tag(:input, :type => "hidden", :id => options[:id], :name => options[:name], :value => value) + "\n"
565	573	end
566	574

trunk/actionpack/test/template/date_helper_test.rb

r8883	r8911
125	125	expected << "</select>\n"
126	126
127		assert_equal expected, select_day(Time.mktime(2003, 8, 16))
128		assert_equal expected, select_day(16)
	127	assert_dom_equal expected, select_day(Time.mktime(2003, 8, 16))
	128	assert_dom_equal expected, select_day(16)
129	129	end
130	130
…	…
134	134	expected << "</select>\n"
135	135
136		assert_equal expected, select_day(Time.mktime(2003, 8, 16), :include_blank => true)
137		assert_equal expected, select_day(16, :include_blank => true)
	136	assert_dom_equal expected, select_day(Time.mktime(2003, 8, 16), :include_blank => true)
	137	assert_dom_equal expected, select_day(16, :include_blank => true)
138	138	end
139	139
…	…
143	143	expected << "</select>\n"
144	144
145		assert_equal expected, select_day(nil, :include_blank => true)
	145	assert_dom_equal expected, select_day(nil, :include_blank => true)
146	146	end
147	147
…	…
151	151	expected << "</select>\n"
152	152
153		assert_equal expected, select_month(Time.mktime(2003, 8, 16))
154		assert_equal expected, select_month(8)
	153	assert_dom_equal expected, select_month(Time.mktime(2003, 8, 16))
	154	assert_dom_equal expected, select_month(8)
155	155	end
156	156
…	…
160	160	expected << "</select>\n"
161	161
162		assert_equal expected, select_month(Time.mktime(2003, 8, 16), :disabled => true)
163		assert_equal expected, select_month(8, :disabled => true)
	162	assert_dom_equal expected, select_month(Time.mktime(2003, 8, 16), :disabled => true)
	163	assert_dom_equal expected, select_month(8, :disabled => true)
164	164	end
165	165
…	…
169	169	expected << "</select>\n"
170	170
171		assert_equal expected, select_month(Time.mktime(2003, 8, 16), :field_name => 'mois')
172		assert_equal expected, select_month(8, :field_name => 'mois')
	171	assert_dom_equal expected, select_month(Time.mktime(2003, 8, 16), :field_name => 'mois')
	172	assert_dom_equal expected, select_month(8, :field_name => 'mois')
173	173	end
174	174
…	…
178	178	expected << "</select>\n"
179	179
180		assert_equal expected, select_month(Time.mktime(2003, 8, 16), :include_blank => true)
181		assert_equal expected, select_month(8, :include_blank => true)
	180	assert_dom_equal expected, select_month(Time.mktime(2003, 8, 16), :include_blank => true)
	181	assert_dom_equal expected, select_month(8, :include_blank => true)
182	182	end
183	183
…	…
187	187	expected << "</select>\n"
188	188
189		assert_equal expected, select_month(nil, :include_blank => true)
	189	assert_dom_equal expected, select_month(nil, :include_blank => true)
190	190	end
191	191
…	…
195	195	expected << "</select>\n"
196	196
197		assert_equal expected, select_month(Time.mktime(2003, 8, 16), :use_month_numbers => true)
198		assert_equal expected, select_month(8, :use_month_numbers => true)
	197	assert_dom_equal expected, select_month(Time.mktime(2003, 8, 16), :use_month_numbers => true)
	198	assert_dom_equal expected, select_month(8, :use_month_numbers => true)
199	199	end
200	200
…	…
204	204	expected << "</select>\n"
205	205
206		assert_equal expected, select_month(Time.mktime(2003, 8, 16), :add_month_numbers => true)
207		assert_equal expected, select_month(8, :add_month_numbers => true)
	206	assert_dom_equal expected, select_month(Time.mktime(2003, 8, 16), :add_month_numbers => true)
	207	assert_dom_equal expected, select_month(8, :add_month_numbers => true)
208	208	end
209	209
…	…
213	213	expected << "</select>\n"
214	214
215		assert_equal expected, select_month(Time.mktime(2003, 8, 16), :add_month_numbers => true, :use_short_month => true)
216		assert_equal expected, select_month(8, :add_month_numbers => true, :use_short_month => true)
	215	assert_dom_equal expected, select_month(Time.mktime(2003, 8, 16), :add_month_numbers => true, :use_short_month => true)
	216	assert_dom_equal expected, select_month(8, :add_month_numbers => true, :use_short_month => true)
217	217	end
218	218
…	…
222	222	expected << "</select>\n"
223	223
224		assert_equal expected, select_month(Time.mktime(2003, 8, 16), :use_short_month => true)
225		assert_equal expected, select_month(8, :use_short_month => true)
	224	assert_dom_equal expected, select_month(Time.mktime(2003, 8, 16), :use_short_month => true)
	225	assert_dom_equal expected, select_month(8, :use_short_month => true)
226	226	end
227	227
…	…
233	233	expected << "</select>\n"
234	234
235		assert_equal expected, select_month(Time.mktime(2003, 8, 16), :use_month_names => month_names)
236		assert_equal expected, select_month(8, :use_month_names => month_names)
	235	assert_dom_equal expected, select_month(Time.mktime(2003, 8, 16), :use_month_names => month_names)
	236	assert_dom_equal expected, select_month(8, :use_month_names => month_names)
237	237	end
238	238
…	…
244	244	expected << "</select>\n"
245	245
246		assert_equal expected, select_month(Time.mktime(2003, 8, 16), :use_month_names => month_names)
247		assert_equal expected, select_month(8, :use_month_names => month_names)
	246	assert_dom_equal expected, select_month(Time.mktime(2003, 8, 16), :use_month_names => month_names)
	247	assert_dom_equal expected, select_month(8, :use_month_names => month_names)
248	248	end
249	249
…	…
261	261	expected << "</select>\n"
262	262
263		assert_equal expected, select_year(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005)
264		assert_equal expected, select_year(2003, :start_year => 2003, :end_year => 2005)
	263	assert_dom_equal expected, select_year(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005)
	264	assert_dom_equal expected, select_year(2003, :start_year => 2003, :end_year => 2005)
265	265	end
266	266
…	…
270	270	expected << "</select>\n"
271	271
272		assert_equal expected, select_year(Time.mktime(2003, 8, 16), :disabled => true, :start_year => 2003, :end_year => 2005)
273		assert_equal expected, select_year(2003, :disabled => true, :start_year => 2003, :end_year => 2005)
	272	assert_dom_equal expected, select_year(Time.mktime(2003, 8, 16), :disabled => true, :start_year => 2003, :end_year => 2005)
	273	assert_dom_equal expected, select_year(2003, :disabled => true, :start_year => 2003, :end_year => 2005)
274	274	end
275	275
…	…
279	279	expected << "</select>\n"
280	280
281		assert_equal expected, select_year(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005, :field_name => 'annee')
282		assert_equal expected, select_year(2003, :start_year => 2003, :end_year => 2005, :field_name => 'annee')
	281	assert_dom_equal expected, select_year(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005, :field_name => 'annee')
	282	assert_dom_equal expected, select_year(2003, :start_year => 2003, :end_year => 2005, :field_name => 'annee')
283	283	end
284	284
…	…
288	288	expected << "</select>\n"
289	289
290		assert_equal expected, select_year(
	290	assert_dom_equal expected, select_year(
291	291	Time.mktime(2003, 8, 16), :prefix => "date_year", :discard_type => true, :start_year => 2003, :end_year => 2005)
292		assert_equal expected, select_year(
	292	assert_dom_equal expected, select_year(
293	293	2003, :prefix => "date_year", :discard_type => true, :start_year => 2003, :end_year => 2005)
294	294	end
…	…
299	299	expected << "</select>\n"
300	300
301		assert_equal expected, select_year(Time.mktime(2005, 8, 16), :start_year => 2005, :end_year => 2003)
302		assert_equal expected, select_year(2005, :start_year => 2005, :end_year => 2003)
	301	assert_dom_equal expected, select_year(Time.mktime(2005, 8, 16), :start_year => 2005, :end_year => 2003)
	302	assert_dom_equal expected, select_year(2005, :start_year => 2005, :end_year => 2003)
303	303	end
304	304
…	…
316	316	expected << "</select>\n"
317	317
318		assert_equal expected, select_hour(Time.mktime(2003, 8, 16, 8, 4, 18))
	318	assert_dom_equal expected, select_hour(Time.mktime(2003, 8, 16, 8, 4, 18))
319	319	end
320	320
…	…
324	324	expected << "</select>\n"
325	325
326		assert_equal expected, select_hour(Time.mktime(2003, 8, 16, 8, 4, 18), :disabled => true)
	326	assert_dom_equal expected, select_hour(Time.mktime(2003, 8, 16, 8, 4, 18), :disabled => true)
327	327	end
328	328
…	…
332	332	expected << "</select>\n"
333	333
334		assert_equal expected, select_hour(Time.mktime(2003, 8, 16, 8, 4, 18), :field_name => 'heure')
	334	assert_dom_equal expected, select_hour(Time.mktime(2003, 8, 16, 8, 4, 18), :field_name => 'heure')
335	335	end
336	336
…	…
340	340	expected << "</select>\n"
341	341
342		assert_equal expected, select_hour(Time.mktime(2003, 8, 16, 8, 4, 18), :include_blank => true)
	342	assert_dom_equal expected, select_hour(Time.mktime(2003, 8, 16, 8, 4, 18), :include_blank => true)
343	343	end
344	344
…	…
348	348	expected << "</select>\n"
349	349
350		assert_equal expected, select_hour(nil, :include_blank => true)
	350	assert_dom_equal expected, select_hour(nil, :include_blank => true)
351	351	end
352	352
…	…
356	356	expected << "</select>\n"
357	357
358		assert_equal expected, select_minute(Time.mktime(2003, 8, 16, 8, 4, 18))
	358	assert_dom_equal expected, select_minute(Time.mktime(2003, 8, 16, 8, 4, 18))
359	359	end
360	360
…	…
364	364	expected << "</select>\n"
365	365
366		assert_equal expected, select_minute(Time.mktime(2003, 8, 16, 8, 4, 18), :disabled => true)
	366	assert_dom_equal expected, select_minute(Time.mktime(2003, 8, 16, 8, 4, 18), :disabled => true)
367	367	end
368	368
…	…
372	372	expected << "</select>\n"
373	373
374		assert_equal expected, select_minute(Time.mktime(2003, 8, 16, 8, 4, 18), :field_name => 'minuto')
	374	assert_dom_equal expected, select_minute(Time.mktime(2003, 8, 16, 8, 4, 18), :field_name => 'minuto')
375	375	end
376	376
…	…
380	380	expected << "</select>\n"
381	381
382		assert_equal expected, select_minute(Time.mktime(2003, 8, 16, 8, 4, 18), :include_blank => true)
	382	assert_dom_equal expected, select_minute(Time.mktime(2003, 8, 16, 8, 4, 18), :include_blank => true)
383	383	end
384	384
…	…
388	388	expected << "</select>\n"
389	389
390		assert_equal expected, select_minute(Time.mktime(2003, 8, 16, 8, 4, 18), { :include_blank => true , :minute_step => 15 })
	390	assert_dom_equal expected, select_minute(Time.mktime(2003, 8, 16, 8, 4, 18), { :include_blank => true , :minute_step => 15 })
391	391	end
392	392
…	…
396	396	expected << "</select>\n"
397	397
398		assert_equal expected, select_minute(nil, :include_blank => true)
	398	assert_dom_equal expected, select_minute(nil, :include_blank => true)
399	399	end
400	400
…	…
404	404	expected << "</select>\n"
405	405
406		assert_equal expected, select_minute(nil, { :include_blank => true , :minute_step => 15 })
	406	assert_dom_equal expected, select_minute(nil, { :include_blank => true , :minute_step => 15 })
407	407	end
408	408
…	…
420	420	expected << "</select>\n"
421	421
422		assert_equal expected, select_second(Time.mktime(2003, 8, 16, 8, 4, 18))
	422	assert_dom_equal expected, select_second(Time.mktime(2003, 8, 16, 8, 4, 18))
423	423	end
424	424
…	…
428	428	expected << "</select>\n"
429	429
430		assert_equal expected, select_second(Time.mktime(2003, 8, 16, 8, 4, 18), :disabled => true)
	430	assert_dom_equal expected, select_second(Time.mktime(2003, 8, 16, 8, 4, 18), :disabled => true)
431	431	end
432	432
…	…
436	436	expected << "</select>\n"
437	437
438		assert_equal expected, select_second(Time.mktime(2003, 8, 16, 8, 4, 18), :field_name => 'segundo')
	438	assert_dom_equal expected, select_second(Time.mktime(2003, 8, 16, 8, 4, 18), :field_name => 'segundo')
439	439	end
440	440
…	…
444	444	expected << "</select>\n"
445	445
446		assert_equal expected, select_second(Time.mktime(2003, 8, 16, 8, 4, 18), :include_blank => true)
	446	assert_dom_equal expected, select_second(Time.mktime(2003, 8, 16, 8, 4, 18), :include_blank => true)
447	447	end
448	448
…	…
452	452	expected << "</select>\n"
453	453
454		assert_equal expected, select_second(nil, :include_blank => true)
	454	assert_dom_equal expected, select_second(nil, :include_blank => true)
455	455	end
456	456
…	…
468	468	expected << "</select>\n"
469	469
470		assert_equal expected, select_date(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005, :prefix => "date[first]")
	470	assert_dom_equal expected, select_date(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005, :prefix => "date[first]")
471	471	end
472	472
…	…
484	484	expected << "</select>\n"
485	485
486		assert_equal expected, select_date(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005, :prefix => "date[first]", :order => [:month, :day, :year])
	486	assert_dom_equal expected, select_date(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005, :prefix => "date[first]", :order => [:month, :day, :year])
487	487	end
488	488
…	…
500	500	expected << "</select>\n"
501	501
502		assert_equal expected, select_date(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005, :prefix => "date[first]", :order => [:day])
	502	assert_dom_equal expected, select_date(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005, :prefix => "date[first]", :order => [:day])
503	503	end
504	504
…	…
516	516	expected << "</select>\n"
517	517
518		assert_equal expected, select_date(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005, :prefix => "date[first]", :disabled => true)
	518	assert_dom_equal expected, select_date(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005, :prefix => "date[first]", :disabled => true)
519	519	end
520	520
…	…
538	538	expected << "</select>\n"
539	539
540		assert_equal expected, select_date(
	540	assert_dom_equal expected, select_date(
541	541	Time.mktime(Date.today.year, 8, 16), :end_year => Date.today.year+1, :prefix => "date[first]"
542	542	)
…	…
562	562	expected << "</select>\n"
563	563
564		assert_equal expected, select_date(
	564	assert_dom_equal expected, select_date(
565	565	Time.mktime(2003, 8, 16), :start_year => 2003, :prefix => "date[first]"
566	566	)
…	…
586	586	expected << "</select>\n"
587	587
588		assert_equal expected, select_date(
	588	assert_dom_equal expected, select_date(
589	589	Time.mktime(Date.today.year, 8, 16), :prefix => "date[first]"
590	590	)
…	…
604	604	expected << "</select>\n"
605	605
606		assert_equal expected, select_date(0, :start_year => 2003, :end_year => 2005, :prefix => "date[first]")
	606	assert_dom_equal expected, select_date(0, :start_year => 2003, :end_year => 2005, :prefix => "date[first]")
607	607	end
608	608
…	…
620	620	expected << "</select>\n"
621	621
622		assert_equal expected, select_date(0, :end_year => Date.today.year+1, :prefix => "date[first]")
	622	assert_dom_equal expected, select_date(0, :end_year => Date.today.year+1, :prefix => "date[first]")
623	623	end
624	624
…	…
637	637	expected << "</select>\n"
638	638
639		assert_equal expected, select_date(0, :start_year => 2003, :prefix => "date[first]")
	639	assert_dom_equal expected, select_date(0, :start_year => 2003, :prefix => "date[first]")
640	640	end
641	641
…	…
653	653	expected << "</select>\n"
654	654
655		assert_equal expected, select_date(0, :prefix => "date[first]")
	655	assert_dom_equal expected, select_date(0, :prefix => "date[first]")
656	656	end
657	657
…	…
669	669	expected << "</select>\n"
670	670
671		assert_equal expected, select_date(nil, :prefix => "date[first]")
	671	assert_dom_equal expected, select_date(nil, :prefix => "date[first]")
672	672	end
673	673
…	…
693	693	expected << "</select>\n"
694	694
695		assert_equal expected, select_datetime(Time.mktime(2003, 8, 16, 8, 4, 18), :start_year => 2003, :end_year => 2005, :prefix => "date[first]")
	695	assert_dom_equal expected, select_datetime(Time.mktime(2003, 8, 16, 8, 4, 18), :start_year => 2003, :end_year => 2005, :prefix => "date[first]")
696	696	end
697	697
…	…
721	721	expected << "</select>\n"
722	722
723		assert_equal expected, select_datetime(Time.mktime(2003, 8, 16, 8, 4, 18), :start_year => 2003, :end_year => 2005, :prefix => "date[first]", :datetime_separator => ' — ', :time_separator => ' : ')
	723	assert_dom_equal expected, select_datetime(Time.mktime(2003, 8, 16, 8, 4, 18), :start_year => 2003, :end_year => 2005, :prefix => "date[first]", :datetime_separator => ' — ', :time_separator => ' : ')
724	724	end
725	725
…	…
745	745	expected << "</select>\n"
746	746
747		assert_equal expected, select_datetime(nil, :prefix => "date[first]")
	747	assert_dom_equal expected, select_datetime(nil, :prefix => "date[first]")
748	748	end
749	749
…	…
757	757	expected << "</select>\n"
758	758
759		assert_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18))
760		assert_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :include_seconds => false)
	759	assert_dom_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18))
	760	assert_dom_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :include_seconds => false)
761	761	end
762	762
…	…
772	772	expected << "</select>\n"
773	773
774		assert_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :time_separator => ' : ')
775		assert_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :time_separator => ' : ', :include_seconds => false)
	774	assert_dom_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :time_separator => ' : ')
	775	assert_dom_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :time_separator => ' : ', :include_seconds => false)
776	776	end
777	777
…	…
789	789	expected << "</select>\n"
790	790
791		assert_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :include_seconds => true)
	791	assert_dom_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :include_seconds => true)
792	792	end
793	793
…	…
809	809	expected << "</select>\n"
810	810
811		assert_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :include_seconds => true, :time_separator => ' : ')
	811	assert_dom_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :include_seconds => true, :time_separator => ' : ')
812	812	end
813	813
…	…
829	829	expected << "</select>\n"
830	830
831		assert_equal expected, date_select("post", "written_on")
	831	assert_dom_equal expected, date_select("post", "written_on")
832	832	end
833	833
…	…
846	846	expected << "</select>\n"
847	847
848		assert_equal expected, date_select("post", "written_on", :order => [ :month, :year ])
	848	assert_dom_equal expected, date_select("post", "written_on", :order => [ :month, :year ])
849	849	end
850	850
…	…
884	884	expected << "</select>\n"
885	885
886		assert_equal expected, date_select("post", "written_on", :index => id)
	886	assert_dom_equal expected, date_select("post", "written_on", :index => id)
887	887	end
888	888
…	…
904	904	expected << "</select>\n"
905	905
906		assert_equal expected, date_select("post[]", "written_on")
	906	assert_dom_equal expected, date_select("post[]", "written_on")
907	907	end
908	908
…	…
923	923	expected << "</select>\n"
924	924
925		assert_equal expected, date_select("post", "written_on", :order => [:day, :month, :year])
	925	assert_dom_equal expected, date_select("post", "written_on", :order => [:day, :month, :year])
926	926	end
927	927
…	…
943	943	expected << "</select>\n"
944	944
945		assert_equal expected, date_select("post", "written_on")
	945	assert_dom_equal expected, date_select("post", "written_on")
946	946	end
947	947
…	…
966	966	expected << "</select>\n"
967	967
968		assert_equal expected, date_select("post", "written_on", :include_blank => true)
	968	assert_dom_equal expected, date_select("post", "written_on", :include_blank => true)
969	969	end
970	970
…	…
985	985	expected << "</select>\n"
986	986
987		assert_equal expected, date_select("post", "written_on", :discard_hour => false)
	987	assert_dom_equal expected, date_select("post", "written_on", :discard_hour => false)
988	988	end
989	989
…	…
1004	1004	expected << "</select>\n"
1005	1005
1006		assert_equal expected, time_select("post", "written_on")
	1006	assert_dom_equal expected, time_select("post", "written_on")
1007	1007	end
1008	1008
…	…
1027	1027	expected << "</select>\n"
1028	1028
1029		assert_equal expected, time_select("post", "written_on", :include_seconds => true)
	1029	assert_dom_equal expected, time_select("post", "written_on", :include_seconds => true)
1030	1030	end
1031	1031
…	…
1056	1056	expected << "</select>\n"
1057	1057
1058		assert_equal expected, datetime_select("post", "updated_at")
	1058	assert_dom_equal expected, datetime_select("post", "updated_at")
1059	1059	end
1060	1060
…	…
1092	1092	expected << "</select>\n"
1093	1093
1094		assert_equal expected, select_date(0, :end_year => Date.today.year+1, :prefix => "date[first]")
	1094	assert_dom_equal expected, select_date(0, :end_year => Date.today.year+1, :prefix => "date[first]")
1095	1095	end
1096	1096
…	…
1110	1110	expected << "</select>\n"
1111	1111
1112		assert_equal expected, select_date(0, :start_year => 2003, :prefix => "date[first]")
	1112	assert_dom_equal expected, select_date(0, :start_year => 2003, :prefix => "date[first]")
1113	1113	end
1114	1114
…	…
1127	1127	expected << "</select>\n"
1128	1128
1129		assert_equal expected, select_date(0, :prefix => "date[first]")
	1129	assert_dom_equal expected, select_date(0, :prefix => "date[first]")
1130	1130	end
1131	1131
…	…
1144	1144	expected << "</select>\n"
1145	1145
1146		assert_equal expected, select_date(nil, :prefix => "date[first]")
	1146	assert_dom_equal expected, select_date(nil, :prefix => "date[first]")
1147	1147	end
1148	1148
…	…
1169	1169	expected << "</select>\n"
1170	1170
1171		assert_equal expected, select_datetime(nil, :prefix => "date[first]")
	1171	assert_dom_equal expected, select_datetime(nil, :prefix => "date[first]")
1172	1172	end
1173	1173
…	…
1200	1200	expected << "</select>\n"
1201	1201
1202		assert_equal expected, datetime_select("post", "updated_at", :index => id)
	1202	assert_dom_equal expected, datetime_select("post", "updated_at", :index => id)
1203	1203	end
1204	1204
…	…
1230	1230	expected << "</select>\n"
1231	1231
1232		assert_equal expected, datetime_select("post[]", "updated_at")
	1232	assert_dom_equal expected, datetime_select("post[]", "updated_at")
1233	1233	end
1234	1234
…	…
1261	1261	expected << "</select>\n"
1262	1262
1263		assert_equal expected, datetime_select("post", "updated_at", :include_seconds => true)
	1263	assert_dom_equal expected, datetime_select("post", "updated_at", :include_seconds => true)
1264	1264	end
1265	1265
…	…
1286	1286	expected << "</select>\n"
1287	1287
1288		assert_equal expected, datetime_select("post", "updated_at", :discard_year => true)
	1288	assert_dom_equal expected, datetime_select("post", "updated_at", :discard_year => true)
1289	1289	end
1290	1290
…	…
1309	1309	expected << "</select>\n"
1310	1310
1311		assert_equal expected, datetime_select("post", "updated_at", :discard_month => true)
	1311	assert_dom_equal expected, datetime_select("post", "updated_at", :discard_month => true)
1312	1312	end
1313	1313
…	…
1328	1328	expected << "</select>\n"
1329	1329
1330		assert_equal expected, datetime_select("post", "updated_at", :discard_year => true, :discard_month => true)
	1330	assert_dom_equal expected, datetime_select("post", "updated_at", :discard_year => true, :discard_month => true)
1331	1331	end
1332	1332
…	…
1355	1355	expected << "</select>\n"
1356	1356
1357		assert_equal expected, datetime_select("post", "updated_at", :order => [:minute, :day, :hour, :month, :year, :second])
	1357	assert_dom_equal expected, datetime_select("post", "updated_at", :order => [:minute, :day, :hour, :month, :year, :second])
1358	1358	end
1359	1359
…	…
1380	1380	expected << "</select>\n"
1381	1381
1382		assert_equal expected, datetime_select("post", "updated_at", :order => [:day, :month])
	1382	assert_dom_equal expected, datetime_select("post", "updated_at", :order => [:day, :month])
1383	1383	end
1384	1384
…	…
1407	1407	expected << "</select>\n"
1408	1408
1409		assert_equal expected, datetime_select("post", "updated_at", :default => Time.local(2006, 9, 19, 15, 16, 35))
	1409	assert_dom_equal expected, datetime_select("post", "updated_at", :default => Time.local(2006, 9, 19, 15, 16, 35))
1410	1410	end
1411	1411
…	…
1427	1427	expected << "</select>\n"
1428	1428
1429		assert_equal expected, date_select("post", "updated_at", :default => Time.local(2006, 9, 19, 15, 16, 35), :include_blank => true)
	1429	assert_dom_equal expected, date_select("post", "updated_at", :default => Time.local(2006, 9, 19, 15, 16, 35), :include_blank => true)
1430	1430	end
1431	1431
…	…
1454	1454	expected << "</select>\n"
1455	1455
1456		assert_equal expected, datetime_select("post", "updated_at", :default => { :month => 10, :minute => 42, :hour => 9 })
	1456	assert_dom_equal expected, datetime_select("post", "updated_at", :default => { :month => 10, :minute => 42, :hour => 9 })
1457	1457	end
1458	1458	end

Rails Trac

Navigation

Changeset 8911

Legend:

trunk/actionpack/lib/action_view/helpers/date_helper.rb

trunk/actionpack/test/template/date_helper_test.rb

Download in other formats: