Skip to content

Commit cbc0213

Browse files
Fix specs
1 parent 08672ef commit cbc0213

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

test/unit/timer_sessions_helper_test.rb

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ class TimerSessionsHelperTest < ActionView::TestCase
5353
session2 = FactoryBot.create(:timer_session, user: User.current, timer_start: Time.zone.now + 1.hour,
5454
timer_end: Time.zone.now + 2.hours)
5555

56-
assert_not time_entries_overlap?(session1, session2)
57-
assert_not time_entries_overlap?(session2, session1)
56+
assert_not overlaps_as_decorator?(session1, session2)
57+
assert_not overlaps_as_decorator?(session2, session1)
5858

5959
session3 = FactoryBot.create(:timer_session, user: User.current, timer_start: Time.zone.now + 30.minutes,
6060
timer_end: Time.zone.now + 1.hours)
6161

62-
assert time_entries_overlap?(session3, session1)
63-
assert time_entries_overlap?(session1, session3)
62+
assert overlaps_as_decorator?(session3, session1)
63+
assert overlaps_as_decorator?(session1, session3)
6464

6565
base_time = Time.utc(2023, 1, 1, 10, 0, 0)
6666
session1 = FactoryBot.create(:timer_session, user: User.current,
@@ -70,8 +70,8 @@ class TimerSessionsHelperTest < ActionView::TestCase
7070
timer_start: base_time + 1.hour + 5.seconds,
7171
timer_end: base_time + 2.hours)
7272

73-
assert_not time_entries_overlap?(session1, session2)
74-
assert_not time_entries_overlap?(session2, session1)
73+
assert_not overlaps_as_decorator?(session1, session2)
74+
assert_not overlaps_as_decorator?(session2, session1)
7575

7676
session1 = FactoryBot.create(:timer_session, user: User.current,
7777
timer_start: base_time,
@@ -80,7 +80,14 @@ class TimerSessionsHelperTest < ActionView::TestCase
8080
timer_start: base_time + 1.hour,
8181
timer_end: base_time + 2.hours)
8282

83-
assert time_entries_overlap?(session1, session2)
84-
assert time_entries_overlap?(session2, session1)
83+
assert overlaps_as_decorator?(session1, session2)
84+
assert overlaps_as_decorator?(session2, session1)
85+
end
86+
87+
def overlaps_as_decorator?(entry, other_entry)
88+
time_entries_overlap?(
89+
TimeEntityDecorator.new(entry),
90+
TimeEntityDecorator.new(other_entry)
91+
)
8592
end
8693
end

0 commit comments

Comments
 (0)