From 355ba32ae6db4ae72361c86688c576709e03d0ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Fri, 24 Nov 2023 21:13:30 +0100 Subject: [PATCH] Default new meeting time to next week --- modules/meeting/app/models/meeting.rb | 8 +++++--- modules/meeting/spec/features/meetings_copy_spec.rb | 4 ++-- .../structured_meetings/structured_meeting_crud_spec.rb | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/meeting/app/models/meeting.rb b/modules/meeting/app/models/meeting.rb index 2f76537a651f..865b331b7d62 100644 --- a/modules/meeting/app/models/meeting.rb +++ b/modules/meeting/app/models/meeting.rb @@ -165,13 +165,15 @@ def all_changeable_participants def copy(attrs) copy = dup - # Called simply to initialize the value - copy.start_date - copy.start_time_hour + # Set a default to next week + copy.start_time = start_time + 1.week copy.author = attrs.delete(:author) copy.attributes = attrs copy.set_initial_values + # Initialize virtual attributes + copy.start_date + copy.start_time_hour copy.participants.clear copy.participants_attributes = allowed_participants.collect(&:copy_attributes) diff --git a/modules/meeting/spec/features/meetings_copy_spec.rb b/modules/meeting/spec/features/meetings_copy_spec.rb index 0bd102932c95..b8722e1bdd74 100644 --- a/modules/meeting/spec/features/meetings_copy_spec.rb +++ b/modules/meeting/spec/features/meetings_copy_spec.rb @@ -62,7 +62,7 @@ shared_let(:twelve_hour_format) { "%I:%M %p" } shared_let(:copied_meeting_time_heading) do - date = start_time.strftime("%m/%d/%Y") + date = start_time.next_week.strftime("%m/%d/%Y") start_of_meeting = start_time.strftime(twelve_hour_format) end_of_meeting = (start_time + meeting.duration.hours).strftime(twelve_hour_format) @@ -90,7 +90,7 @@ expect(page) .to have_field 'Duration', with: meeting.duration expect(page) - .to have_field 'Start date', with: start_time.strftime("%Y-%m-%d") + .to have_field 'Start date', with: start_time.next_week.strftime("%Y-%m-%d") expect(page) .to have_field 'Time', with: start_time.strftime("%H:%M") diff --git a/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb b/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb index 81b01efdf6df..ee5735b5e51a 100644 --- a/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb +++ b/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb @@ -271,7 +271,7 @@ click_button 'Create' expect(page).to have_text 'Your meeting is empty' - new_meeting = StructuredMeeting.order(id: :asc).last + new_meeting = StructuredMeeting.reorder(id: :asc).last expect(page).to have_current_path "/meetings/#{new_meeting.id}" end