From f625b87f241a6a002274bd01750796985d6e0d8d Mon Sep 17 00:00:00 2001 From: Emilio Tagua Date: Wed, 22 Sep 2010 14:50:08 -0300 Subject: These tests shouldn't depend on local time to pass or fail, we can use utc here. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- actionpack/test/template/date_helper_i18n_test.rb | 2 +- actionpack/test/template/date_helper_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'actionpack/test') diff --git a/actionpack/test/template/date_helper_i18n_test.rb b/actionpack/test/template/date_helper_i18n_test.rb index 74498e4ffc..d45215acfd 100644 --- a/actionpack/test/template/date_helper_i18n_test.rb +++ b/actionpack/test/template/date_helper_i18n_test.rb @@ -5,7 +5,7 @@ class DateHelperDistanceOfTimeInWordsI18nTests < Test::Unit::TestCase attr_reader :request def setup - @from = Time.mktime(2004, 6, 6, 21, 45, 0) + @from = Time.utc(2004, 6, 6, 21, 45, 0) end # distance_of_time_in_words diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb index 0d9508dfe8..ea7c096b97 100644 --- a/actionpack/test/template/date_helper_test.rb +++ b/actionpack/test/template/date_helper_test.rb @@ -99,7 +99,7 @@ class DateHelperTest < ActionView::TestCase end def test_distance_in_words - from = Time.mktime(2004, 6, 6, 21, 45, 0) + from = Time.utc(2004, 6, 6, 21, 45, 0) assert_distance_of_time_in_words(from) end -- cgit v1.2.3