diff --git a/app/services/event_service.rb b/app/services/event_service.rb index 639353313..7a6adcaf6 100644 --- a/app/services/event_service.rb +++ b/app/services/event_service.rb @@ -33,8 +33,8 @@ class EventService end def date_range(starting, ending, all_day) - start_date = Time.zone.parse(starting[:date]) - end_date = Time.zone.parse(ending[:date]) + start_date = Date.parse(starting[:date]) + end_date = Date.parse(ending[:date]) start_time = starting[:time] ? Time.zone.parse(starting[:time]) : nil end_time = ending[:time] ? Time.zone.parse(ending[:time]) : nil if all_day || start_time.nil? || end_time.nil? diff --git a/test/integration/events/timezone_test.rb b/test/integration/events/timezone_test.rb index 2c2489e41..4f8db9e4a 100644 --- a/test/integration/events/timezone_test.rb +++ b/test/integration/events/timezone_test.rb @@ -46,8 +46,8 @@ class Events::TimezoneTest < ActionDispatch::IntegrationTest e = Event.find_by(id: event[:id]) assert_not_nil e, 'Event was not created in database' - assert_equal '2023-06-15', e.availability.start_at.to_date.iso8601 - assert_equal '2023-06-15', e.availability.end_at.to_date.iso8601 + assert_equal '2023-06-14', e.availability.start_at.to_date.iso8601 + assert_equal '2023-06-14', e.availability.end_at.to_date.iso8601 assert_equal '09:48', e.availability.start_at.strftime('%R') assert_equal '11:48', e.availability.end_at.strftime('%R') end