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

Updated regex for LabelLocator and FieldLabeledLocator to work with labels whose text ends in a non-word character like \? or #

Browse Source
This commit is contained in:
Zach Dennis 2009-04-14 17:09:46 -04:00 committed by mike.gaffney
parent ff42db076f
commit 7c08390bb8
6 changed files with 93 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/webrat/core/locators/field_labeled_locator.rb
View File

@ -20,7 +20,7 @@ module Webrat
def matching_label_elements def matching_label_elements
label_elements.select do |label_element| label_elements.select do |label_element|
text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}\b/i text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}(\b|\Z)/i
end end
end end

2
lib/webrat/core/locators/label_locator.rb
View File

@ -12,7 +12,7 @@ module Webrat
def label_element def label_element
label_elements.detect do |label_element| label_elements.detect do |label_element|
text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}\b/i text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}(\b|\Z)/i
end end
end end

15
spec/public/locators/field_labeled_spec.rb
View File

@ -153,5 +153,20 @@ describe "field_labeled" do
should_return_a Webrat::TextField, :for => "The Label" should_return_a Webrat::TextField, :for => "The Label"
with_an_id_of "element_42", :for => "The Label" with_an_id_of "element_42", :for => "The Label"
end end
describe "finding a field whose label ends with an non word character" do
using_this_html <<-HTML
<html>
<form>
<label for="element_42">License #</label>
<input type="text" id="element_42">
</form>
</html>
HTML
should_return_a Webrat::TextField, :for => "License #"
with_an_id_of "element_42", :for => "License #"
should_raise_error_matching /Could not find .* "Other License #"/, :for => "Other License #"
end
end end

24
spec/public/select_date_spec.rb
View File

@ -71,6 +71,30 @@ describe "select_date" do
select_date "December 25, 2003" select_date "December 25, 2003"
click_button click_button
end end
it "should work when the label ends in a non word character" do
with_html <<-HTML
<html>
<form action="/appointments" method="post">
<label for="appointment_date">date ?</label><br />
<select id="appointment_date_1i" name="appointment[date(1i)]">
<option value="2003">2003</option>
</select>
<select id="appointment_date_2i" name="appointment[date(2i)]">
<option value="12">December</option>
</select>
<select id="appointment_date_3i" name="appointment[date(3i)]">
<option value="25">25</option>
</select>
<input type="submit" />
</form>
</html>
HTML
webrat_session.should_receive(:post).with("/appointments",
"appointment" => {"date(1i)" => '2003', "date(2i)" => "12", "date(3i)" => "25"})
select_date Date.parse("December 25, 2003"), :from => "date ?"
click_button
end
it "should fail if the specified label is not found" do it "should fail if the specified label is not found" do
with_html <<-HTML with_html <<-HTML

31
spec/public/select_datetime_spec.rb
View File

@ -61,6 +61,37 @@ describe "select_datetime" do
click_button click_button
end end
it "should work when the label ends in a non word character" do
with_html <<-HTML
<html>
<form action="/appointments" method="post">
<label for="appointment_time">Time ?</label><br />
<select id="appointment_time_1i" name="appointment[time(1i)]">
<option value="2003">2003</option>
</select>
<select id="appointment_time_2i" name="appointment[time(2i)]">
<option value="12">December</option>
</select>
<select id="appointment_time_3i" name="appointment[time(3i)]">
<option value="25">25</option>
</select>
<select id="appointment_time_4i" name="appointment[time(4i)]">
<option value="09">09</option>
</select>
: <select id="appointment_time_5i" name="appointment[time(5i)]">
<option value="30">30</option>
</select>
<input type="submit" />
</form>
</html>
HTML
webrat_session.should_receive(:post).with("/appointments",
"appointment" => {"time(1i)" => '2003', "time(2i)" => "12", "time(3i)" => "25", "time(4i)" => "09", "time(5i)" => "30"})
select_datetime "December 25, 2003 9:30", :from => "Time ?"
click_button
end
it "should work when no label is specified" do it "should work when no label is specified" do
with_html <<-HTML with_html <<-HTML
<html> <html>

21
spec/public/select_time_spec.rb
View File

@ -43,6 +43,27 @@ describe "select_time" do
click_button click_button
end end
it "should work when the label ends in a non word character" do
with_html <<-HTML
<html>
<form action="/appointments" method="post">
<label for="appointment_time">Time #</label><br />
<select id="appointment_time_4i" name="appointment[time(4i)]">
<option value="09">09</option>
</select>
: <select id="appointment_time_5i" name="appointment[time(5i)]">
<option value="30">30</option>
</select>
<input type="submit" />
</form>
</html>
HTML
webrat_session.should_receive(:post).with("/appointments",
"appointment" => {"time(4i)" => "09", "time(5i)" => "30"})
select_time "9:30AM", :from => "Time #"
click_button
end
it "should work when no label is specified" do it "should work when no label is specified" do
with_html <<-HTML with_html <<-HTML
<html> <html>