aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/core_ext
diff options
context:
space:
mode:
authorColin Curtin <colin@procore.com>2008-11-26 10:18:03 -0800
committerColin Curtin <colin@procore.com>2008-11-26 10:18:03 -0800
commit4812e350b9e96641a29c8db6ea153426dad1c9a2 (patch)
tree1aa5ab05d8ff420c833677505f9b884ec61e4627 /activesupport/test/core_ext
parent78af01f80b3622237462d150aca4aba18204c093 (diff)
parentd18bfa2a4165297dbf5e6b1fff1731fefa9dd135 (diff)
downloadrails-4812e350b9e96641a29c8db6ea153426dad1c9a2.tar.gz
rails-4812e350b9e96641a29c8db6ea153426dad1c9a2.tar.bz2
rails-4812e350b9e96641a29c8db6ea153426dad1c9a2.zip
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'activesupport/test/core_ext')
-rw-r--r--activesupport/test/core_ext/time_ext_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index 11ec1c6cd6..fd17f7a812 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -123,7 +123,7 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
def test_end_of_year
assert_equal Time.local(2007,12,31,23,59,59), Time.local(2007,2,22,10,10,10).end_of_year
assert_equal Time.local(2007,12,31,23,59,59), Time.local(2007,12,31,10,10,10).end_of_year
- end
+ end
def test_beginning_of_year
assert_equal Time.local(2005,1,1,0,0,0), Time.local(2005,2,22,10,10,10).beginning_of_year