jro_apps/redmine Commit - r12204:3c540594dc59

Fixed test failure with ruby1.8 (#8842)....

Jean-Philippe Lang -

r12204:3c540594dc59

parent child

Context file:

r12204:3c540594dc59

app/models/query.rb +1 -1

                        case operator_for(field)
                        when "=", ">=", "<=", "><"
                          add_filter_error(field, :invalid) if values_for(field).detect {|v|
-                           v.present? && (!v.match(/\A\d{4}-\d{2}-\d{2}(T\d{2}((:)?\d{2}){,2}(Z|\d{2}:?\d{2})?)?\z/) || parse_date(v).nil?)
+                           v.present? && (!v.match(/\A\d{4}-\d{2}-\d{2}(T\d{2}((:)?\d{2}){0,2}(Z|\d{2}:?\d{2})?)?\z/) || parse_date(v).nil?)
                          }
                        when ">t-", "<t-", "t-", ">t+", "<t+", "t+", "><t+", "><t-"
                          add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^\d+$/) }

test/unit/query_test.rb +14 0

                  find_issues_with_query(query)
                end
+               def test_operator_date_lesser_than_with_timestamp
+                 query = IssueQuery.new(:name => '_')
+                 query.add_filter('updated_on', '<=', ['2011-07-10T19:13:52'])
+                 assert_match /issues\.updated_on <= '2011-07-10 19:13:52/, query.statement
+                 find_issues_with_query(query)
+               end
                def test_operator_date_greater_than
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('due_date', '>=', ['2011-07-10'])
                  find_issues_with_query(query)
                end
+               def test_operator_date_greater_than_with_timestamp
+                 query = IssueQuery.new(:name => '_')
+                 query.add_filter('updated_on', '>=', ['2011-07-10T19:13:52'])
+                 assert_match /issues\.updated_on > '2011-07-10 19:13:51'/, query.statement
+                 find_issues_with_query(query)
+               end
                def test_operator_date_between
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('due_date', '><', ['2011-06-23', '2011-07-10'])

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages