aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-02-21 13:31:13 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-02-21 13:32:34 -0300
commitb4051edf841c8a6780df9af7afa9892bfd811c79 (patch)
tree722072eb4c5263bfb53bd9e7e6edd6e362209af0 /actionpack/test/template
parent953e19ecd97bad0d849f46a45cff01a057b6f9d6 (diff)
downloadrails-b4051edf841c8a6780df9af7afa9892bfd811c79.tar.gz
rails-b4051edf841c8a6780df9af7afa9892bfd811c79.tar.bz2
rails-b4051edf841c8a6780df9af7afa9892bfd811c79.zip
Use #grep to filter priority zones when a regexp is given
Diffstat (limited to 'actionpack/test/template')
-rw-r--r--actionpack/test/template/form_options_helper_test.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index b68bb159fe..04cdd068c8 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -1086,11 +1086,13 @@ class FormOptionsHelperTest < ActionView::TestCase
def test_time_zone_select_with_priority_zones_as_regexp
@firm = Firm.new("D")
+
+ priority_zones = /A|D/
@fake_timezones.each_with_index do |tz, i|
- tz.stubs(:=~).returns(i.zero? || i == 3)
+ priority_zones.stubs(:===).with(tz).returns(i.zero? || i == 3)
end
- html = time_zone_select("firm", "time_zone", /A|D/)
+ html = time_zone_select("firm", "time_zone", priority_zones)
assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
"<option value=\"A\">A</option>\n" +
"<option value=\"D\" selected=\"selected\">D</option>" +