From bf1017b1619320db51cc1eb2652fe1c29064527b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Wed, 3 Apr 2024 20:31:09 +0200 Subject: [PATCH] Fix renamed time attribute --- .../spec/features/meetings_copy_spec.rb | 2 +- .../spec/features/meetings_index_spec.rb | 18 +++++++++--------- .../structured_meeting_crud_spec.rb | 2 +- .../spec/support/pages/meetings/show.rb | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/meeting/spec/features/meetings_copy_spec.rb b/modules/meeting/spec/features/meetings_copy_spec.rb index 6c6b838ee361..bf6a5f30ffbf 100644 --- a/modules/meeting/spec/features/meetings_copy_spec.rb +++ b/modules/meeting/spec/features/meetings_copy_spec.rb @@ -66,7 +66,7 @@ start_of_meeting = start_time.strftime(twelve_hour_format) end_of_meeting = (start_time + meeting.duration.hours).strftime(twelve_hour_format) - "Time: #{date} #{start_of_meeting} - #{end_of_meeting} (GMT+00:00) UTC" + "Start time: #{date} #{start_of_meeting} - #{end_of_meeting} (GMT+00:00) UTC" end before do diff --git a/modules/meeting/spec/features/meetings_index_spec.rb b/modules/meeting/spec/features/meetings_index_spec.rb index 941ac61d057e..9bda13f026e5 100644 --- a/modules/meeting/spec/features/meetings_index_spec.rb +++ b/modules/meeting/spec/features/meetings_index_spec.rb @@ -274,11 +274,11 @@ def setup_meeting_involvement other_project_meeting) end - aggregate_failures "Sorting by Time" do - meetings_page.click_to_sort_by("Time") + aggregate_failures "Sorting by Start time" do + meetings_page.click_to_sort_by("Start time") meetings_page.expect_meetings_listed_in_order(meeting, other_project_meeting) - meetings_page.click_to_sort_by("Time") + meetings_page.click_to_sort_by("Start time") meetings_page.expect_meetings_listed_in_order(other_project_meeting, meeting) end @@ -400,20 +400,20 @@ def setup_meeting_involvement meeting) end - aggregate_failures "Sorting by Time" do - meetings_page.click_to_sort_by("Time") + aggregate_failures "Sorting by Start time" do + meetings_page.click_to_sort_by("Start time") meetings_page.expect_meetings_listed_in_order(meeting, tomorrows_meeting) - meetings_page.click_to_sort_by("Time") + meetings_page.click_to_sort_by("Start time") meetings_page.expect_meetings_listed_in_order(tomorrows_meeting, meeting) end - aggregate_failures "Sorting by Time" do - meetings_page.click_to_sort_by("Time") + aggregate_failures "Sorting by Start time" do + meetings_page.click_to_sort_by("Start time") meetings_page.expect_meetings_listed_in_order(meeting, tomorrows_meeting) - meetings_page.click_to_sort_by("Time") + meetings_page.click_to_sort_by("Start time") meetings_page.expect_meetings_listed_in_order(tomorrows_meeting, meeting) end 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 035933bab4e4..763337f93026 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 @@ -168,7 +168,7 @@ show_page.add_agenda_item do fill_in "Title", with: "My agenda item" - fill_in "Duration in minutes", with: "25" + fill_in "Duration (min)", with: "25" end show_page.expect_agenda_item title: "My agenda item" diff --git a/modules/meeting/spec/support/pages/meetings/show.rb b/modules/meeting/spec/support/pages/meetings/show.rb index 9373c42f2718..18ddc3764267 100644 --- a/modules/meeting/spec/support/pages/meetings/show.rb +++ b/modules/meeting/spec/support/pages/meetings/show.rb @@ -66,7 +66,7 @@ def expect_uninvited(*users) def expect_date_time(expected) expect(page) - .to have_content("Time: #{expected}") + .to have_content("Start time: #{expected}") end def expect_link_to_location(location)