diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-09-22 14:50:08 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-24 15:51:29 +0200 |
| commit | f625b87f241a6a002274bd01750796985d6e0d8d (patch) | |
| tree | 6dddf6118bc610d72c8f4079da902c76c48c175d /actionpack/test | |
| parent | 63039b9c3356f73421b3742134959014d81973b0 (diff) | |
| download | rails-f625b87f241a6a002274bd01750796985d6e0d8d.tar.gz rails-f625b87f241a6a002274bd01750796985d6e0d8d.tar.bz2 rails-f625b87f241a6a002274bd01750796985d6e0d8d.zip | |
These tests shouldn't depend on local time to pass or fail, we can use utc here.
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/template/date_helper_i18n_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/date_helper_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
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 |