diff options
| -rw-r--r-- | lib/redmine/helpers/gantt.rb | 2 | ||||
| -rw-r--r-- | test/unit/query_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb index bd784609b..5854a15f2 100644 --- a/lib/redmine/helpers/gantt.rb +++ b/lib/redmine/helpers/gantt.rb @@ -502,7 +502,7 @@ module Redmine lines(:image => gc, :top => top, :zoom => zoom, :subject_width => subject_width, :format => :image) # today red line - if User.current.today >= @date_from and User.current.today <= date_to + if User.current.today.between?(@date_from, date_to) gc.stroke('red') x = (User.current.today - @date_from + 1) * zoom + subject_width gc.draw('line %g,%g %g,%g' % [ diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index 24f4b1404..155a74b64 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -623,7 +623,7 @@ class QueryTest < ActiveSupport::TestCase query.add_filter('due_date', '><t+', ['15']) issues = find_issues_with_query(query) assert !issues.empty? - issues.each {|issue| assert(issue.due_date >= Date.today && issue.due_date <= (Date.today + 15))} + issues.each {|issue| assert(issue.due_date.between?(Date.today, (Date.today + 15)))} end def test_operator_less_than_ago @@ -641,7 +641,7 @@ class QueryTest < ActiveSupport::TestCase query.add_filter('due_date', '><t-', ['3']) issues = find_issues_with_query(query) assert !issues.empty? - issues.each {|issue| assert(issue.due_date >= (Date.today - 3) && issue.due_date <= Date.today)} + issues.each {|issue| assert(issue.due_date.between?((Date.today - 3), Date.today))} end def test_operator_more_than_ago |