@@ -53,14 +53,14 @@ class TimerSessionsHelperTest < ActionView::TestCase
53
53
session2 = FactoryBot . create ( :timer_session , user : User . current , timer_start : Time . zone . now + 1 . hour ,
54
54
timer_end : Time . zone . now + 2 . hours )
55
55
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 )
58
58
59
59
session3 = FactoryBot . create ( :timer_session , user : User . current , timer_start : Time . zone . now + 30 . minutes ,
60
60
timer_end : Time . zone . now + 1 . hours )
61
61
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 )
64
64
65
65
base_time = Time . utc ( 2023 , 1 , 1 , 10 , 0 , 0 )
66
66
session1 = FactoryBot . create ( :timer_session , user : User . current ,
@@ -70,8 +70,8 @@ class TimerSessionsHelperTest < ActionView::TestCase
70
70
timer_start : base_time + 1 . hour + 5 . seconds ,
71
71
timer_end : base_time + 2 . hours )
72
72
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 )
75
75
76
76
session1 = FactoryBot . create ( :timer_session , user : User . current ,
77
77
timer_start : base_time ,
@@ -80,7 +80,14 @@ class TimerSessionsHelperTest < ActionView::TestCase
80
80
timer_start : base_time + 1 . hour ,
81
81
timer_end : base_time + 2 . hours )
82
82
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
+ )
85
92
end
86
93
end
0 commit comments