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

Removing :suffixes and :suffix_convention options from selects_date and selects_time methods

Browse Source
This commit is contained in:
Bryan Helmkamp 2008-11-16 19:29:13 -05:00
parent 31cc6b75da
commit f2f8bae190
4 changed files with 23 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
lib/webrat/core/scope.rb
View File

@ -97,11 +97,13 @@ module Webrat
alias_method :select, :selects alias_method :select, :selects
DATE_TIME_SUFFIXES = {:rails => {:year => '1i', :month => '2i', :day => '3i', DATE_TIME_SUFFIXES = {
:hour => '4i', :minute => '5i'}, :year => '1i',
:full_words => {:year => 'year', :month => 'month', :day => 'day', :month => '2i',
:hour => 'hour', :minute => 'minute'} :day => '3i',
} :hour => '4i',
:minute => '5i'
}
# Verifies that date elements (year, month, day) exist on the current page # Verifies that date elements (year, month, day) exist on the current page
# with the specified values. You can optionally restrict the search to a specific # with the specified values. You can optionally restrict the search to a specific
@ -109,35 +111,28 @@ module Webrat
# label. Selects all the date elements with date provided. The date provided may # label. Selects all the date elements with date provided. The date provided may
# be a string or a Date/Time object. # be a string or a Date/Time object.
# #
# By default Rail's convention is used for detecting the date elements, but this # Rail's convention is used for detecting the date elements. All elements
# may be overriden by assinging a <tt>options[:suffix_convention]</tt> or # are assumed to have a shared prefix. You may also specify the prefix
# <tt>options[:suffixes]</tt>. In all cases all elements are assumed to have a # by assigning <tt>options[:id_prefix]</tt>.
# shared prefix. For example, a birthday date on a form might have the following:
# 'birthday_Year', 'birthday_Month', 'birthday_Day'. You may also specify the
# prefix by assigning <tt>options[:id_prefix]</tt>.
# #
# Examples: # Examples:
# selects_date "January 23, 2004" # selects_date "January 23, 2004"
# selects_date "April 26, 1982", :from => "Birthday" # selects_date "April 26, 1982", :from => "Birthday"
# selects_date Date.parse("December 25, 2000"), :from => "Event" # selects_date Date.parse("December 25, 2000"), :from => "Event"
# selects_date "April 26, 1982", :suffix_convention => :full_words # selects_date "April 26, 1982", :id_prefix => 'birthday'
# selects_date "April 26, 1982", :id_prefix => 'birthday',
# :suffixes => {:year => 'Year', :month => 'Mon', :day => 'Day'}
def selects_date(date_to_select, options ={}) def selects_date(date_to_select, options ={})
date = date_to_select.is_a?(Date) || date_to_select.is_a?(Time) ? date = date_to_select.is_a?(Date) || date_to_select.is_a?(Time) ?
date_to_select : Date.parse(date_to_select) date_to_select : Date.parse(date_to_select)
suffixes = extract_date_time_suffixes(options)
id_prefix = locate_id_prefix(options) do id_prefix = locate_id_prefix(options) do
year_field = find_field_with_id(/(.*?)_#{suffixes[:year]}$/) year_field = find_field_with_id(/(.*?)_#{DATE_TIME_SUFFIXES[:year]}$/)
flunk("No date fields were found") unless year_field && year_field.id =~ /(.*?)_1i/ flunk("No date fields were found") unless year_field && year_field.id =~ /(.*?)_1i/
$1 $1
end end
selects date.year, :from => "#{id_prefix}_#{suffixes[:year]}" selects date.year, :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:year]}"
selects date.strftime('%B'), :from => "#{id_prefix}_#{suffixes[:month]}" selects date.strftime('%B'), :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:month]}"
selects date.day, :from => "#{id_prefix}_#{suffixes[:day]}" selects date.day, :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:day]}"
end end
alias_method :select_date, :selects_date alias_method :select_date, :selects_date
@ -148,12 +143,9 @@ module Webrat
# label. Selects all the time elements with date provided. The time provided may # label. Selects all the time elements with date provided. The time provided may
# be a string or a Time object. # be a string or a Time object.
# #
# By default Rail's convention is used for detecting the time elements, but this # Rail's convention is used for detecting the time elements. All elements are
# may be overriden by assinging a <tt>options[:suffix_convention]</tt> or # assumed to have a shared prefix. You may specify the prefix by assigning
# <tt>options[:suffixes]</tt>. In all cases all elements are assumed to have a # <tt>options[:id_prefix]</tt>.
# shared prefix. For example, an appointment time on a form might have the
# following: 'appt_time_hour', 'appt_time_min'. You may also specify the
# prefix by assigning <tt>options[:id_prefix]</tt>.
# #
# Note: Just like Rails' time_select helper this assumes the form is using # Note: Just like Rails' time_select helper this assumes the form is using
# 24 hour select boxes, and not 12 hours with AM/PM. # 24 hour select boxes, and not 12 hours with AM/PM.
@ -162,22 +154,18 @@ module Webrat
# selects_time "9:30" # selects_time "9:30"
# selects_date "3:30PM", :from => "Party Time" # selects_date "3:30PM", :from => "Party Time"
# selects_date Time.parse("10:00PM"), :from => "Event" # selects_date Time.parse("10:00PM"), :from => "Event"
# selects_date "8:30", :suffix_convention => :full_words # selects_date "10:30AM", :id_prefix => 'meeting'
# selects_date "10:30AM", :id_prefix => 'meeting',
# :suffixes => {:hour => 'Hour', :min => 'Min'}
def selects_time(time_to_select, options ={}) def selects_time(time_to_select, options ={})
time = time_to_select.is_a?(Time) ? time_to_select : Time.parse(time_to_select) time = time_to_select.is_a?(Time) ? time_to_select : Time.parse(time_to_select)
suffixes = extract_date_time_suffixes(options)
id_prefix = locate_id_prefix(options) do id_prefix = locate_id_prefix(options) do
hour_field = find_field_with_id(/(.*?)_#{suffixes[:hour]}$/) hour_field = find_field_with_id(/(.*?)_#{DATE_TIME_SUFFIXES[:hour]}$/)
flunk("No time fields were found") unless hour_field && hour_field.id =~ /(.*?)_4i/ flunk("No time fields were found") unless hour_field && hour_field.id =~ /(.*?)_4i/
$1 $1
end end
selects time.hour.to_s.rjust(2,'0'), :from => "#{id_prefix}_#{suffixes[:hour]}" selects time.hour.to_s.rjust(2,'0'), :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:hour]}"
selects time.min.to_s.rjust(2,'0'), :from => "#{id_prefix}_#{suffixes[:minute]}" selects time.min.to_s.rjust(2,'0'), :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:minute]}"
end end
@ -190,10 +178,7 @@ module Webrat
# selects_datetime "January 23, 2004 10:30AM" # selects_datetime "January 23, 2004 10:30AM"
# selects_datetime "April 26, 1982 7:00PM", :from => "Birthday" # selects_datetime "April 26, 1982 7:00PM", :from => "Birthday"
# selects_datetime Time.parse("December 25, 2000 15:30"), :from => "Event" # selects_datetime Time.parse("December 25, 2000 15:30"), :from => "Event"
# selects_datetime "April 26, 1982 5:50PM", :suffix_convention => :full_words # selects_datetime "April 26, 1982 5:50PM", :id_prefix => 'birthday'
# selects_datetime "April 26, 1982 5:50PM", :id_prefix => 'birthday',
# :suffixes => {:year => 'Year', :month => 'Mon', :day => 'Day',
# :hour => 'Hour', :minute => 'Min'}
def selects_datetime(time_to_select, options ={}) def selects_datetime(time_to_select, options ={})
time = time_to_select.is_a?(Time) ? time_to_select : Time.parse(time_to_select) time = time_to_select.is_a?(Time) ? time_to_select : Time.parse(time_to_select)
@ -309,12 +294,6 @@ module Webrat
id_prefix = options[:from] ? find_field_id_for_label(options[:from]) : yield id_prefix = options[:from] ? find_field_id_for_label(options[:from]) : yield
end end
def extract_date_time_suffixes(options) #:nodoc:
options[:suffixes] ||
DATE_TIME_SUFFIXES[options[:suffix_convention]] ||
DATE_TIME_SUFFIXES[:rails]
end
def areas #:nodoc: def areas #:nodoc:
Webrat::XML.css_search(dom, "area").map do |element| Webrat::XML.css_search(dom, "area").map do |element|
Area.new(@session, element) Area.new(@session, element)

46
spec/api/selects_date_spec.rb
View File

@ -27,52 +27,6 @@ describe "selects_date" do
@session.click_button @session.click_button
end end
it "should select the date components with the suffix convention provided" do
@session.response_body = <<-EOS
<form action="/appointments" method="post">
<label for="appointment_date">Date</label><br />
<select id="appointment_date_year" name="appointment[year]">
<option value="2003">2003</option>
</select>
<select id="appointment_date_month" name="appointment[month]">
<option value="12">December</option>
</select>
<select id="appointment_date_day" name="appointment[day]">
<option value="25">25</option>
</select>
<input type="submit" />
</form>
EOS
@session.should_receive(:post).with("/appointments",
"appointment" => {"year" => '2003', "month" => "12", "day" => "25"})
@session.selects_date "December 25, 2003 9:30", :from => "Date", :suffix_convention => :full_words
@session.click_button
end
it "should select the date components with the suffixes provided" do
@session.response_body = <<-EOS
<form action="/appointments" method="post">
<label for="appointment_date">Date</label><br />
<select id="appointment_date_y" name="appointment[y]">
<option value="2003">2003</option>
</select>
<select id="appointment_date_mo" name="appointment[mo]">
<option value="12">December</option>
</select>
<select id="appointment_date_d" name="appointment[d]">
<option value="25">25</option>
</select>
<input type="submit" />
</form>
EOS
@session.should_receive(:post).with("/appointments",
"appointment" => {"y" => '2003', "mo" => "12", "d" => "25"})
@session.selects_date "December 25, 2003 9:30", :from => "Date",
:suffixes => {:year => 'y', :month => 'mo', :day => 'd'}
@session.click_button
end
it "should accept a date object" do it "should accept a date object" do
@session.response_body = <<-EOS @session.response_body = <<-EOS
<form action="/appointments" method="post"> <form action="/appointments" method="post">

57
spec/api/selects_datetime_spec.rb
View File

@ -33,63 +33,6 @@ describe "selects_datetime" do
@session.click_button @session.click_button
end end
it "should select the date and time components with the suffix convention provided" do
@session.response_body = <<-EOS
<form action="/appointments" method="post">
<label for="appointment_time">Time</label><br />
<select id="appointment_time_year" name="appointment[year]">
<option value="2003">2003</option>
</select>
<select id="appointment_time_month" name="appointment[month]">
<option value="12">December</option>
</select>
<select id="appointment_time_day" name="appointment[day]">
<option value="25">25</option>
</select>
<select id="appointment_time_hour" name="appointment[hour]">
<option value="09">09</option>
</select>
: <select id="appointment_time_minute" name="appointment[minute]">
<option value="30">30</option>
</select>
<input type="submit" />
</form>
EOS
@session.should_receive(:post).with("/appointments",
"appointment" => {"year" => '2003', "month" => "12", "day" => "25", "hour" => "09", "minute" => "30"})
@session.selects_datetime "December 25, 2003 9:30", :from => "Time", :suffix_convention => :full_words
@session.click_button
end
it "should select the date and time components with the suffixes provided" do
@session.response_body = <<-EOS
<form action="/appointments" method="post">
<label for="appointment_time">Time</label><br />
<select id="appointment_time_y" name="appointment[y]">
<option value="2003">2003</option>
</select>
<select id="appointment_time_mo" name="appointment[mo]">
<option value="12">December</option>
</select>
<select id="appointment_time_d" name="appointment[d]">
<option value="25">25</option>
</select>
<select id="appointment_time_h" name="appointment[h]">
<option value="09">09</option>
</select>
: <select id="appointment_time_mi" name="appointment[mi]">
<option value="30">30</option>
</select>
<input type="submit" />
</form>
EOS
@session.should_receive(:post).with("/appointments",
"appointment" => {"y" => '2003', "mo" => "12", "d" => "25", "h" => "09", "mi" => "30"})
@session.selects_datetime "December 25, 2003 9:30", :from => "Time",
:suffixes => {:year => 'y', :month => 'mo', :day => 'd', :hour => 'h', :minute => 'mi'}
@session.click_button
end
it "should accept a time object" do it "should accept a time object" do
@session.response_body = <<-EOS @session.response_body = <<-EOS
<form action="/appointments" method="post"> <form action="/appointments" method="post">

39
spec/api/selects_time_spec.rb
View File

@ -24,45 +24,6 @@ describe "select_time" do
@session.click_button @session.click_button
end end
it "should select time components with the suffix convention provided" do
@session.response_body = <<-EOS
<form action="/appointments" method="post">
<label for="appointment_time">Time</label><br />
<select id="appointment_time_hour" name="appointment[hour]">
<option value="09">09</option>
</select>
: <select id="appointment_time_minute" name="appointment[minute]">
<option value="30">30</option>
</select>
<input type="submit" />
</form>
EOS
@session.should_receive(:post).with("/appointments",
"appointment" => {"hour" => "09", "minute" => "30"})
@session.selects_time "9:30", :from => "Time", :suffix_convention => :full_words
@session.click_button
end
it "should select the time components with the suffixes provided" do
@session.response_body = <<-EOS
<form action="/appointments" method="post">
<label for="appointment_time">Time</label><br />
<select id="appointment_time_h" name="appointment[h]">
<option value="09">09</option>
</select>
: <select id="appointment_time_mi" name="appointment[mi]">
<option value="30">30</option>
</select>
<input type="submit" />
</form>
EOS
@session.should_receive(:post).with("/appointments",
"appointment" => {"h" => "09", "mi" => "30"})
@session.selects_time "9:30", :from => "Time",
:suffixes => {:hour => 'h', :minute => 'mi'}
@session.click_button
end
it "should accept a time object" do it "should accept a time object" do
@session.response_body = <<-EOS @session.response_body = <<-EOS
<form action="/appointments" method="post"> <form action="/appointments" method="post">