More consistent business calendar tests

excid3 · Sep 15, 2023 · a4835bd · a4835bd
1 parent 90668d2
commit a4835bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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