Merged r14165 and r14166 (#19544).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14207 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-04-25 07:37:46 +00:00
parent 94910b1e09
commit 873dff0d36
3 changed files with 19 additions and 6 deletions

View File

@@ -54,7 +54,7 @@ class SortHelperTest < ActionView::TestCase
sort_init 'attr1', 'desc'
sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
assert_equal ['table1.attr1', 'table2.attr2 DESC'], sort_clause
assert_equal ['table1.attr1 ASC', 'table2.attr2 DESC'], sort_clause
assert_equal 'attr1,attr2:desc', @session['foo_bar_sort']
end
@@ -74,7 +74,7 @@ class SortHelperTest < ActionView::TestCase
sort_init 'attr1', 'desc'
sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
assert_equal ['table1.attr1', 'table2.attr2'], sort_clause
assert_equal ['table1.attr1 ASC', 'table2.attr2 ASC'], sort_clause
assert_equal 'attr1,attr2', @session['foo_bar_sort']
end