Skip to content

Commit e7f6c07

Browse files
Revert test change
1 parent 3340742 commit e7f6c07

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

app/models/timer_session.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def can_overlap?(other_session)
6464
end
6565

6666
def round_to_nearest_minute(time)
67-
time + ((30 - time.sec) / 60 * 60)
67+
Time.at((time.to_f / 60).round * 60).utc
6868
end
6969

7070
def set_recorded_hours

test/unit/timer_session_test.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ class TimerSessionTest < ActiveSupport::TestCase
8181
timer_start: base_time + 1.hour + 5.seconds,
8282
timer_end: base_time + 2.hours)
8383

84-
assert_not session1.overlaps?(session2)
85-
assert_not session2.overlaps?(session1)
84+
assert session1.overlaps?(session2)
85+
assert session2.overlaps?(session1)
8686

8787
session1 = FactoryBot.create(:timer_session, user: User.current,
8888
timer_start: base_time,
@@ -91,7 +91,7 @@ class TimerSessionTest < ActiveSupport::TestCase
9191
timer_start: base_time + 1.hour,
9292
timer_end: base_time + 2.hours)
9393

94-
assert session1.overlaps?(session2)
95-
assert session2.overlaps?(session1)
94+
assert_not session1.overlaps?(session2)
95+
assert_not session2.overlaps?(session1)
9696
end
9797
end

0 commit comments

Comments
 (0)