Merged r15600 from trunk to 3.3-stable.

TimeEntryTest#test_spent_on_with_time fails at Japanese daytime.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17111 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/unit/time_entry_test.rb b/test/unit/time_entry_test.rb
index 59f416c9ea8183bc689742e1a0967a082348ddcc..b86b1c53a0b2583f2235115d893b6adcf2e6a2ff 100644 (file)
--- a/test/unit/time_entry_test.rb
+++ b/test/unit/time_entry_test.rb
@@ -122,7 +122,7 @@ class TimeEntryTest < ActiveSupport::TestCase
   def test_spent_on_with_time
     c = TimeEntry.new
     c.spent_on = Time.now
-    assert_equal Date.today, c.spent_on
+    assert_kind_of Date, c.spent_on
   end
 
   def test_validate_time_entry