public
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/rails/rails.git
Fix FormOptionsHelper tests.

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
DefV (author)
Wed Jun 11 05:17:40 -0700 2008
lifo (committer)
Wed Jun 11 05:17:40 -0700 2008
commit  ca9641f8a7ca1142d0ea99405a079c8699bd443c
tree    98b241fed24674e18829eb1d2eabcdce9c41a3a8
parent  3e07f320c10b53ec21b947d949d0063e724c5fd8
...
20
21
22
23
 
24
25
26
...
183
184
185
186
 
187
188
189
...
195
196
197
198
 
199
200
201
...
207
208
209
210
 
211
212
213
...
1287
1288
1289
1290
 
1291
1292
1293
...
20
21
22
 
23
24
25
26
...
183
184
185
 
186
187
188
189
...
195
196
197
 
198
199
200
201
...
207
208
209
 
210
211
212
213
...
1287
1288
1289
 
1290
1291
1292
1293
0
@@ -20,7 +20,7 @@ class MockTimeZone
0
   end
0
 end
0
 
0
-ActionView::Helpers::FormOptionsHelper::TimeZone = MockTimeZone
0
+ActiveSupport::TimeZone = MockTimeZone
0
 
0
 class FormOptionsHelperTest < ActionView::TestCase
0
   tests ActionView::Helpers::FormOptionsHelper
0
@@ -183,7 +183,7 @@ class FormOptionsHelperTest < ActionView::TestCase
0
   end
0
 
0
   def test_time_zone_options_with_priority_zones
0
-    zones = [ TimeZone.new( "B" ), TimeZone.new( "E" ) ]
0
+    zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
0
     opts = time_zone_options_for_select( nil, zones )
0
     assert_dom_equal "<option value=\"B\">B</option>\n" +
0
                  "<option value=\"E\">E</option>" +
0
@@ -195,7 +195,7 @@ class FormOptionsHelperTest < ActionView::TestCase
0
   end
0
 
0
   def test_time_zone_options_with_selected_priority_zones
0
-    zones = [ TimeZone.new( "B" ), TimeZone.new( "E" ) ]
0
+    zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
0
     opts = time_zone_options_for_select( "E", zones )
0
     assert_dom_equal "<option value=\"B\">B</option>\n" +
0
                  "<option value=\"E\" selected=\"selected\">E</option>" +
0
@@ -207,7 +207,7 @@ class FormOptionsHelperTest < ActionView::TestCase
0
   end
0
 
0
   def test_time_zone_options_with_unselected_priority_zones
0
-    zones = [ TimeZone.new( "B" ), TimeZone.new( "E" ) ]
0
+    zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
0
     opts = time_zone_options_for_select( "C", zones )
0
     assert_dom_equal "<option value=\"B\">B</option>\n" +
0
                  "<option value=\"E\">E</option>" +
0
@@ -1287,7 +1287,7 @@ COUNTRIES
0
 
0
   def test_time_zone_select_with_priority_zones
0
     @firm = Firm.new("D")
0
-    zones = [ TimeZone.new("A"), TimeZone.new("D") ]
0
+    zones = [ ActiveSupport::TimeZone.new("A"), ActiveSupport::TimeZone.new("D") ]
0
     html = time_zone_select("firm", "time_zone", zones )
0
     assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
0
                  "<option value=\"A\">A</option>\n" +

Comments