sort custom field issue filter by type and position (#12018)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10555 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/unit/helpers/queries_helper_test.rb

@@ -19,6 +19,7 @@ require File.expand_path('../../../test_helper', __FILE__)
 
 class QueriesHelperTest < ActionView::TestCase
   include QueriesHelper
+  include Redmine::I18n
 
   fixtures :projects, :enabled_modules, :users, :members,
            :member_roles, :roles, :trackers, :issue_statuses,
@@ -42,4 +43,23 @@ class QueriesHelperTest < ActionView::TestCase
     assert_equal "watcher_id", fo[17][1]
     assert_equal "is_private", fo[18][1]
   end
+
+  def test_order_custom_fields
+    set_language_if_valid 'en'
+    field = UserCustomField.new(
+              :name => 'order test', :field_format => 'string',
+              :is_for_all => true, :is_filter => true
+            )
+    assert field.save
+    User.current = User.find_by_login('admin')
+    query = Query.new(:project => nil, :name => '_')
+    assert_equal 32, query.available_filters.size
+    fo = filters_options(query)
+    assert_equal 33, fo.size
+    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]
+  end
 end