From 3019a022c7eeb657a02fa3935f37886a7bbccb3a Mon Sep 17 00:00:00 2001 From: Jimmy Date: Fri, 19 Mar 2021 17:22:08 +0800 Subject: [PATCH] [fix] Fix style; Fix start_hour and end_hour in test --- app/models/event_schedule.rb | 1 + app/views/schedules/happening_now.haml | 2 +- spec/controllers/schedules_controller_spec.rb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/event_schedule.rb b/app/models/event_schedule.rb index 3c52c499..7126d067 100644 --- a/app/models/event_schedule.rb +++ b/app/models/event_schedule.rb @@ -56,6 +56,7 @@ class EventSchedule < ApplicationRecord # def happening_now?(threshold = 30.minutes) return false if end_time < Time.now + event_time_range = start_time..end_time now_range = (Time.now - threshold)..(Time.now + threshold) event_time_range.overlaps?(now_range) diff --git a/app/views/schedules/happening_now.haml b/app/views/schedules/happening_now.haml index 537727c3..438cd774 100644 --- a/app/views/schedules/happening_now.haml +++ b/app/views/schedules/happening_now.haml @@ -12,7 +12,7 @@ %h3 This page was loaded at = inyourtz(Time.now) do - #{Time.now.strftime('%a %b %d at %I:%M %P (%z)').to_s} + = Time.now.strftime('%a %b %d at %I:%M %P (%z)') .row / TODO: Clean this up, merge with all events page. diff --git a/spec/controllers/schedules_controller_spec.rb b/spec/controllers/schedules_controller_spec.rb index 67919bde..3896c7f7 100644 --- a/spec/controllers/schedules_controller_spec.rb +++ b/spec/controllers/schedules_controller_spec.rb @@ -30,7 +30,7 @@ describe SchedulesController do describe 'GET #happening_now' do before do - @conference2 = create(:full_conference, start_date: 1.day.ago, end_date: 7.days.from_now) + @conference2 = create(:full_conference, start_date: 1.day.ago, end_date: 7.days.from_now, start_hour: 0, end_hour: 24) @program = @conference2.program @selected_schedule = create(:schedule, program: @program) @program.update_attributes!(selected_schedule: @selected_schedule)