Refactor: use an ordered hash to store available filters and remove :order option (#13154).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11372 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2013-02-14 20:37:17 +00:00
parent f77edce621
commit 0be82ea2c4
6 changed files with 158 additions and 167 deletions

View File

@@ -29,7 +29,7 @@ class QueriesHelperTest < ActionView::TestCase
:projects_trackers,
:custom_fields_trackers
def test_order
def test_filters_options_should_be_ordered
User.current = User.find_by_login('admin')
query = IssueQuery.new(:project => nil, :name => '_')
assert_equal 30, query.available_filters.size
@@ -40,17 +40,16 @@ class QueriesHelperTest < ActionView::TestCase
assert_equal "project_id", fo[2][1]
assert_equal "tracker_id", fo[3][1]
assert_equal "priority_id", fo[4][1]
assert_equal "watcher_id", fo[17][1]
assert_equal "is_private", fo[18][1]
assert_equal "is_private", fo[17][1]
assert_equal "watcher_id", fo[18][1]
end
def test_order_custom_fields
def test_filters_options_should_be_ordered_with_custom_fields
set_language_if_valid 'en'
field = UserCustomField.new(
field = UserCustomField.create!(
:name => 'order test', :field_format => 'string',
:is_for_all => true, :is_filter => true
)
assert field.save
User.current = User.find_by_login('admin')
query = IssueQuery.new(:project => nil, :name => '_')
assert_equal 32, query.available_filters.size
@@ -59,7 +58,7 @@ class QueriesHelperTest < ActionView::TestCase
assert_equal "Searchable field", fo[19][0]
assert_equal "Database", fo[20][0]
assert_equal "Project's Development status", fo[21][0]
assert_equal "Assignee's order test", fo[22][0]
assert_equal "Author's order test", fo[23][0]
assert_equal "Author's order test", fo[22][0]
assert_equal "Assignee's order test", fo[23][0]
end
end