diff test/unit/helpers/queries_helper_test.rb @ 1464:261b3d9a4903 redmine-2.4

Update to Redmine 2.4 branch rev 12663

--- a/test/unit/helpers/queries_helper_test.rb	Fri Jun 14 09:05:06 2013 +0100
+++ b/test/unit/helpers/queries_helper_test.rb	Tue Jan 14 14:37:42 2014 +0000
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# Copyright (C) 2006-2013  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -29,37 +29,11 @@
            :projects_trackers,
            :custom_fields_trackers
 
-  def test_order
-    User.current = User.find_by_login('admin')
-    query = Query.new(:project => nil, :name => '_')
-    assert_equal 30, query.available_filters.size
+  def test_filters_options_has_empty_item
+    query = IssueQuery.new
+    filter_count = query.available_filters.size
     fo = filters_options(query)
-    assert_equal 31, fo.size
+    assert_equal filter_count + 1, fo.size
     assert_equal [], fo[0]
-    assert_equal "status_id", fo[1][1]
-    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]
-  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