From 949c4291a4bffae582dc3987e8f4980ea13a2cff Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Tue, 17 Sep 2013 16:10:22 -0300 Subject: There's no need to do this AS does the following inside Time.find_zone! ... `ActiveSupport::TimeZone[time_zone] || TZInfo::Timezone.get(time_zone)` and given that the test is stubbing AS::TZ[] we don't need the removed code. --- actionview/test/template/form_options_helper_test.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'actionview') diff --git a/actionview/test/template/form_options_helper_test.rb b/actionview/test/template/form_options_helper_test.rb index 3ec138b639..a6977766d1 100644 --- a/actionview/test/template/form_options_helper_test.rb +++ b/actionview/test/template/form_options_helper_test.rb @@ -1,5 +1,4 @@ require 'abstract_unit' -require 'tzinfo' class Map < Hash def category @@ -7,8 +6,6 @@ class Map < Hash end end -TZInfo::Timezone.cattr_reader :loaded_zones - class FormOptionsHelperTest < ActionView::TestCase tests ActionView::Helpers::FormOptionsHelper @@ -22,7 +19,7 @@ class FormOptionsHelperTest < ActionView::TestCase def setup @fake_timezones = %w(A B C D E).map do |id| - tz = TZInfo::Timezone.loaded_zones[id] = stub(:name => id, :to_s => id) + tz = stub(:name => id, :to_s => id) ActiveSupport::TimeZone.stubs(:[]).with(id).returns(tz) tz end -- cgit v1.2.3