From ea868d4cc7e9c1f96b1a80233ef4aa73134558f9 Mon Sep 17 00:00:00 2001 From: differentreality Date: Wed, 17 Aug 2016 15:55:10 +0300 Subject: [PATCH] voting period is open when voting dates are not set --- app/helpers/application_helper.rb | 2 +- app/models/program.rb | 6 +++--- spec/models/program_spec.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6dcbd422..440204b3 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -4,7 +4,7 @@ module ApplicationHelper # def voting_open_or_close(program) return if program.voting_period? - if program.voting_start_date > Date.today + if program.voting_start_date > Time.current return 'Voting period has not started yet!' else # voting_end_date > Date.today because voting_start_date < voting_end_date return 'Voting period is over!' diff --git a/app/models/program.rb b/app/models/program.rb index 49d84937..31fccb4d 100644 --- a/app/models/program.rb +++ b/app/models/program.rb @@ -72,16 +72,16 @@ class Program < ActiveRecord::Base def show_voting? return true unless blind_voting - Date.today > voting_end_date + Time.current > voting_end_date end ## # Checks if we are still in voting period # ====Returns - # * +true+ -> If the voting period is not over yet + # * +true+ -> If the voting period is not over yet (or if the voting dates are not set) # * +false+ -> If the voting period is over def voting_period? - return false unless voting_start_date && voting_end_date + return true unless voting_start_date && voting_end_date (voting_start_date.to_datetime..voting_end_date.to_datetime).cover? Time.current end diff --git a/spec/models/program_spec.rb b/spec/models/program_spec.rb index 5306df3f..f491499b 100644 --- a/spec/models/program_spec.rb +++ b/spec/models/program_spec.rb @@ -90,8 +90,8 @@ describe Program do end describe 'voting_period?' do - it 'retuns false when voting dates are not set' do - expect(program.voting_period?).to eq false + it 'retuns true when voting dates are not set' do + expect(program.voting_period?).to eq true end shared_examples 'voting period' do |voting_start_date, voting_end_date, returns|