diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-04-29 11:28:27 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-04-29 11:28:27 +0000 |
commit | 57f63d513c2bbaea1f5d60f4b83272f858f6d736 (patch) | |
tree | 2aa9432224983b7b4fb5a0efa95c829e3ad1bcde /test/unit/query_test.rb | |
parent | 07df1242b9932aa098e27ea283c7a1b4055695e7 (diff) | |
download | redmine-57f63d513c2bbaea1f5d60f4b83272f858f6d736.tar.gz redmine-57f63d513c2bbaea1f5d60f4b83272f858f6d736.zip |
Makes 'This week' filter work with any starting day of week (#7097).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5596 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit/query_test.rb')
-rw-r--r-- | test/unit/query_test.rb | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index 90fa593e0..0f03260ae 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -191,6 +191,29 @@ class QueryTest < ActiveSupport::TestCase result.each {|issue| assert issue.subject.downcase.include?('unable') } end + def test_range_for_this_week_with_week_starting_on_monday + I18n.locale = :fr + assert_equal '1', I18n.t(:general_first_day_of_week) + + Date.stubs(:today).returns(Date.parse('2011-04-29')) + + query = Query.new(:project => Project.find(1), :name => '_') + query.add_filter('due_date', 'w', ['']) + assert query.statement.include?("issues.due_date > '2011-04-24 23:59:59' AND issues.due_date <= '2011-05-01 23:59:59") + I18n.locale = :en + end + + def test_range_for_this_week_with_week_starting_on_sunday + I18n.locale = :en + assert_equal '7', I18n.t(:general_first_day_of_week) + + Date.stubs(:today).returns(Date.parse('2011-04-29')) + + query = Query.new(:project => Project.find(1), :name => '_') + query.add_filter('due_date', 'w', ['']) + assert query.statement.include?("issues.due_date > '2011-04-23 23:59:59' AND issues.due_date <= '2011-04-30 23:59:59") + end + def test_operator_does_not_contains query = Query.new(:project => Project.find(1), :name => '_') query.add_filter('subject', '!~', ['uNable']) |