From 0bf775e77c2bf5229f457e6310603f49b473f819 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Thu, 2 Apr 2020 07:55:39 +0000 Subject: Merged r19636 from trunk to 4.1-stable (#32737). git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19638 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/query_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/unit') diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index c7d805571..cc5a23530 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -1638,12 +1638,12 @@ class QueryTest < ActiveSupport::TestCase def test_sort_criteria_should_have_only_first_three_elements q = IssueQuery.new q.sort_criteria = [['priority', 'desc'], ['tracker', 'asc'], ['priority', 'asc'], ['id', 'asc'], ['project', 'asc'], ['subject', 'asc']] - assert_equal [['priority', 'desc'], ['tracker', 'asc'], ['priority', 'asc']], q.sort_criteria + assert_equal [['priority', 'desc'], ['tracker', 'asc'], ['id', 'asc']], q.sort_criteria end - def test_sort_criteria_should_remove_blank_keys + def test_sort_criteria_should_remove_blank_or_duplicate_keys q = IssueQuery.new - q.sort_criteria = [['priority', 'desc'], [nil, 'desc'], ['', 'asc'], ['project', 'asc']] + q.sort_criteria = [['priority', 'desc'], [nil, 'desc'], ['', 'asc'], ['priority', 'asc'], ['project', 'asc']] assert_equal [['priority', 'desc'], ['project', 'asc']], q.sort_criteria end -- cgit v1.2.3