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" +