From a4835bd147a4ffd06e20321eb1d129df1165bad9 Mon Sep 17 00:00:00 2001 From: Chris Oliver Date: Fri, 15 Sep 2023 09:05:13 -0500 Subject: [PATCH] More consistent business calendar tests --- test/dummy/app/calendars/business_week_calendar.rb | 4 ++-- test/integrations/custom_calendar_test.rb | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/dummy/app/calendars/business_week_calendar.rb b/test/dummy/app/calendars/business_week_calendar.rb index 76a60f53..1ac3d54c 100644 --- a/test/dummy/app/calendars/business_week_calendar.rb +++ b/test/dummy/app/calendars/business_week_calendar.rb @@ -2,8 +2,8 @@ class BusinessWeekCalendar < SimpleCalendar::Calendar private def date_range - beginning = start_date.beginning_of_week + 1.day - ending = start_date.end_of_week - 1.day + beginning = start_date.monday + ending = beginning + 5.days (beginning..ending).to_a end end diff --git a/test/integrations/custom_calendar_test.rb b/test/integrations/custom_calendar_test.rb index 092e72bb..d95de469 100644 --- a/test/integrations/custom_calendar_test.rb +++ b/test/integrations/custom_calendar_test.rb @@ -15,6 +15,7 @@ class CustomCalendarIntegrationTest < ActionDispatch::IntegrationTest test "calendar render two day events" do event = meetings(:two_day_event) + event.update(start_time: Time.current.monday, end_time: (Time.current.monday + 1.day).end_of_day) get business_week_meetings_path, params: {start_date: event.start_time.to_date} assert_select "div.simple-calendar" do assert_select "div", text: event.name, count: 2 @@ -23,6 +24,7 @@ class CustomCalendarIntegrationTest < ActionDispatch::IntegrationTest test "calendar render three day events" do event = meetings(:three_day_event) + event.update(start_time: Time.current.monday, end_time: (Time.current.monday + 2.days).end_of_day) get business_week_meetings_path, params: {start_date: event.start_time.to_date} assert_select "div.simple-calendar" do assert_select "div", text: event.name, count: 3