summaryrefslogtreecommitdiffstats
path: root/test/unit
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-12-11 15:09:24 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-12-11 15:09:24 +0000
commit515315028d08b8a7a6f935153adbcf517dbccb20 (patch)
tree9aee8c67d5047eb97bb3cb8858a3b4827273ef90 /test/unit
parentce826caae5470c40a76a2aecea4075238d131857 (diff)
downloadredmine-515315028d08b8a7a6f935153adbcf517dbccb20.tar.gz
redmine-515315028d08b8a7a6f935153adbcf517dbccb20.zip
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
Diffstat (limited to 'test/unit')
-rw-r--r--test/unit/time_entry_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/unit/time_entry_test.rb b/test/unit/time_entry_test.rb
index 59f416c9e..b86b1c53a 100644
--- 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