kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Merge pull request #23521 from kamipo/fix_assert_in_delta_failure 

Fix `assert_in_delta` test failure
This commit is contained in:
Rafael França 2016-02-22 12:05:39 -03:00
parent c901fad42c 71366209d5
commit aa3d440871
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activerecord/test/cases/timestamp_test.rb
View File

@ -98,8 +98,11 @@ class TimestampTest < ActiveRecord::TestCase
task = Task.first
previous_value = task.ending
task.touch(:ending)
now = Time.now.change(usec: 0)
assert_not_equal previous_value, task.ending
assert_in_delta Time.now, task.ending, 1
assert_in_delta now, task.ending, 1
end
def test_touching_an_attribute_updates_timestamp_with_given_time
@ -120,10 +123,12 @@ class TimestampTest < ActiveRecord::TestCase
previous_ending = task.ending
task.touch(:starting, :ending)
now = Time.now.change(usec: 0)
assert_not_equal previous_starting, task.starting
assert_not_equal previous_ending, task.ending
assert_in_delta Time.now, task.starting, 1
assert_in_delta Time.now, task.ending, 1
assert_in_delta now, task.starting, 1
assert_in_delta now, task.ending, 1
end
def test_touching_a_record_without_timestamps_is_unexceptional