@@ -1,2 +1,5 @@ module Admin::GiveawayRoundsHelper + def time_html_for_index(giveaway_round) + giveaway_round.pretty_time + end end app/helpers/admin/giveaway_rounds_helper.rb @@ -16,6 +16,7 @@ class GiveawayRound < ActiveRecord::Base end def pretty_time - time.strftime "%a %b %d %I:%M %p" + tz = ApplicationSetting.value 'time_zone' + tz.utc_to_local(time).strftime("%a %b %d %I:%M %p") end end app/models/giveaway_round.rb @@ -72,6 +72,28 @@ describe '/admin/giveaway_rounds/edit' do end end +describe '/admin/giveaway_rounds' do + integrate_views + controller_name 'admin/giveaway_rounds' + + before :all do + ApplicationSetting.sample( + :name => 'time_zone', :value_class => 'TZInfo::Timezone', + :value => TZInfo::Timezone.get('America/New_York') + ) + end + + before :each do + setup_configuration_and_login + GiveawayRound.sample :time => Time.utc(2009,9,30,19,45) + get :index + end + + it 'should display times in the local time zone' do + response.should have_tag('td', :text => /Wed Sep 30 03:45 PM/) + end +end + describe '/admin/giveaway_rounds/new' do integrate_views controller_name 'admin/giveaway_rounds' spec/controllers/admin/giveaway_rounds_controller_spec.rb 90bb9ac60bffae59dc3c3c06701ae56730d0b666 Francis Hwang francis@diversionmedia.com http://github.com/fhwang/raflcon/commit/b0f37a2b9725f4a9ca462427bcb845217ee19c11 b0f37a2b9725f4a9ca462427bcb845217ee19c11 2009-11-06T09:13:13-08:00 2009-11-06T09:13:13-08:00 using chosen time zone in admin displays e52aad46205f498261c485e3d4a9cb2eb28aacab Francis Hwang francis@diversionmedia.com