Merge branch 'main' into feature/19656-configure-github-minitest-reporter

Author: CuddlyBunion341

.nvmrc

@@ -1 +1 @@
-20.11.0
+20.19.0

app/models/timer_session.rb

@@ -44,11 +44,22 @@ def relevant_issues
   end
 
   def overlaps?(other_session)
-    (timer_start...timer_end).overlaps?(other_session.timer_start...other_session.timer_end)
+    return false unless timer_end.present? && other_session.timer_start.present?
+
+    this_start = round_to_nearest_minute(timer_start)
+    this_end = round_to_nearest_minute(timer_end)
+    other_start = round_to_nearest_minute(other_session.timer_start)
+    other_end = round_to_nearest_minute(other_session.timer_end)
+
+    (this_start...this_end).overlaps?(other_start...other_end)
   end
 
   private
 
+  def round_to_nearest_minute(time)
+    Time.at((time.to_f / 60).round * 60).utc
+  end
+
   def set_recorded_hours
     return unless timer_start.present? && timer_end.present?
 

app/views/time_tracker/cancel.js.erb

@@ -1 +1 @@
-window.location.href='<%= timer_sessions_path %>';
+window.location.href = '<%= timer_sessions_path %>' + window.location.search;

app/views/time_tracker/stop.js.erb

@@ -1 +1 @@
-window.location.href='<%= timer_sessions_path %>';
+window.location.href = '<%= timer_sessions_path %>' + window.location.search;

app/views/timer_sessions/_timer_sessions_day_block.html.erb

@@ -11,7 +11,7 @@
         <%= render TimerSessionEntryComponent.new(
           timer_session_entry: time_entity,
           discrepancy_detected: @non_matching_timer_session_ids.include?(time_entity.id),
-          overlap_detected: timer_sessions.any? { |other_entity| time_entity != other_entity && other_entity.overlaps?(time_entity) },
+          overlap_detected: timer_sessions.any? { |other_entity| time_entity != other_entity && other_entity&.overlaps?(time_entity) },
           gap_separator: draw_gap_separator(time_entity, previous_time_entity)
         ) %>
       <% end %>

app/views/timer_sessions/update_redirect.js.erb

@@ -1 +1 @@
-window.location.href='<%= timer_sessions_path %>';
+window.location.href = '<%= timer_sessions_path %>' + window.location.search;

test/system/timer_management_test.rb

@@ -111,4 +111,46 @@ class TimerManagementTest < ApplicationSystemTestCase
     assert has_content?(Issue.first.subject, wait: 5)
     assert has_content?(Issue.second.subject)
   end
+
+  test 'preserves filter parameters when stopping a timer' do
+    filter_date = 1.week.ago.strftime('%Y-%m-%d')
+    current_date = Date.today.strftime('%Y-%m-%d')
+
+    visit timer_sessions_path(filter: { min_date: filter_date, max_date: current_date })
+
+    assert_equal filter_date, find('input[name="filter[min_date]"]').value
+    assert_equal current_date, find('input[name="filter[max_date]"]').value
+
+    find('[data-name="timer-start"]').click
+    assert has_content?(I18n.t('timer_sessions.timer.stop'))
+
+    fill_in 'timer_session[issue_id]', with: Issue.first.subject
+    sleep(1)
+    find('#timer_session_issue_id').send_keys(:arrow_down)
+    find('#timer_session_issue_id').send_keys(:tab)
+
+    find('[data-name="timer-stop"]', wait: 5).click
+
+    assert_equal filter_date, find('input[name="filter[min_date]"]').value
+    assert_equal current_date, find('input[name="filter[max_date]"]').value
+  end
+
+  test 'preserves filter parameters when canceling a timer' do
+    filter_date = 1.week.ago.strftime('%Y-%m-%d')
+    current_date = Date.today.strftime('%Y-%m-%d')
+
+    visit timer_sessions_path(filter: { min_date: filter_date, max_date: current_date })
+
+    assert_equal filter_date, find('input[name="filter[min_date]"]').value
+    assert_equal current_date, find('input[name="filter[max_date]"]').value
+
+    find('[data-name="timer-start"]').click
+    assert has_content?(I18n.t('timer_sessions.timer.cancel'))
+
+    find('[data-name="timer-cancel"]', wait: 5).click
+    page.driver.browser.switch_to.alert.accept
+
+    assert_equal filter_date, find('input[name="filter[min_date]"]').value
+    assert_equal current_date, find('input[name="filter[max_date]"]').value
+  end
 end

test/system/timer_sessions_management_test.rb

@@ -81,4 +81,25 @@ class TimerSessionsManagementTest < ApplicationSystemTestCase
     click_button I18n.t('timer_sessions.work_report_query.buttons.submit')
     assert has_content?(I18n.t(:label_spent_time))
   end
+
+  test 'preserves filter parameters when updating a timer session' do
+    filter_date = 1.week.ago.strftime('%Y-%m-%d')
+    current_date = Date.today.strftime('%Y-%m-%d')
+
+    visit timer_sessions_path(filter: { min_date: filter_date, max_date: current_date })
+
+    assert_equal filter_date, find('input[name="filter[min_date]"]').value
+    assert_equal current_date, find('input[name="filter[max_date]"]').value
+
+    find('[data-timer-session-edit-button]', match: :first).click
+    assert has_content?(I18n.t('timer_sessions.edit.title'))
+
+    within '.edit-modal' do
+      fill_in TimerSession.human_attribute_name(:comments), with: 'Updated with filters'
+      find('[data-modal-update-button]', match: :first).click
+    end
+
+    assert_equal filter_date, find('input[name="filter[min_date]"]').value
+    assert_equal current_date, find('input[name="filter[max_date]"]').value
+  end
 end

test/unit/timer_session_test.rb

@@ -58,7 +58,7 @@ class TimerSessionTest < ActiveSupport::TestCase
     assert_not @timer_session.valid?
   end
 
-  test 'overlaps?' do
+  test 'overlaps?' do # rubocop:disable Metrics/BlockLength
     session1 = FactoryBot.create(:timer_session, user: User.current, timer_start: Time.zone.now,
                                                  timer_end: Time.zone.now + 1.hour)
     session2 = FactoryBot.create(:timer_session, user: User.current, timer_start: Time.zone.now + 1.hour,
@@ -72,5 +72,26 @@ class TimerSessionTest < ActiveSupport::TestCase
 
     assert session3.overlaps?(session1)
     assert session1.overlaps?(session3)
+
+    base_time = Time.utc(2023, 1, 1, 10, 0, 0)
+    session1 = FactoryBot.create(:timer_session, user: User.current,
+                                                 timer_start: base_time,
+                                                 timer_end: base_time + 1.hour + 25.seconds)
+    session2 = FactoryBot.create(:timer_session, user: User.current,
+                                                 timer_start: base_time + 1.hour + 5.seconds,
+                                                 timer_end: base_time + 2.hours)
+
+    assert_not session1.overlaps?(session2)
+    assert_not session2.overlaps?(session1)
+
+    session1 = FactoryBot.create(:timer_session, user: User.current,
+                                                 timer_start: base_time,
+                                                 timer_end: base_time + 1.hour + 32.seconds)
+    session2 = FactoryBot.create(:timer_session, user: User.current,
+                                                 timer_start: base_time + 1.hour,
+                                                 timer_end: base_time + 2.hours)
+
+    assert session1.overlaps?(session2)
+    assert session2.overlaps?(session1)
   end
 end