Skip to content

Commit aa3d440

Browse files
committed
Merge pull request rails#23521 from kamipo/fix_assert_in_delta_failure
Fix `assert_in_delta` test failure
2 parents c901fad + 7136620 commit aa3d440

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

activerecord/test/cases/timestamp_test.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,11 @@ def test_touching_an_attribute_updates_it
9898
task = Task.first
9999
previous_value = task.ending
100100
task.touch(:ending)
101+
102+
now = Time.now.change(usec: 0)
103+
101104
assert_not_equal previous_value, task.ending
102-
assert_in_delta Time.now, task.ending, 1
105+
assert_in_delta now, task.ending, 1
103106
end
104107

105108
def test_touching_an_attribute_updates_timestamp_with_given_time
@@ -120,10 +123,12 @@ def test_touching_many_attributes_updates_them
120123
previous_ending = task.ending
121124
task.touch(:starting, :ending)
122125

126+
now = Time.now.change(usec: 0)
127+
123128
assert_not_equal previous_starting, task.starting
124129
assert_not_equal previous_ending, task.ending
125-
assert_in_delta Time.now, task.starting, 1
126-
assert_in_delta Time.now, task.ending, 1
130+
assert_in_delta now, task.starting, 1
131+
assert_in_delta now, task.ending, 1
127132
end
128133

129134
def test_touching_a_record_without_timestamps_is_unexceptional

0 commit comments

Comments
 (0)