From f2a609c3589cb64ec36b4e3ccc64428af4f2439d Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 16 May 2013 10:55:27 +0000
Subject: [PATCH] move filter order tests from helper to model.

r11372 (#13154) moves filter order logic from helper to model.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11848 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/helpers/queries_helper_test.rb | 33 +-----------------------
 test/unit/query_test.rb                  | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/test/unit/helpers/queries_helper_test.rb b/test/unit/helpers/queries_helper_test.rb
index b12898753..3cb5d1373 100644
--- a/test/unit/helpers/queries_helper_test.rb
+++ b/test/unit/helpers/queries_helper_test.rb
@@ -19,7 +19,6 @@ 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,
@@ -29,41 +28,11 @@ class QueriesHelperTest < ActionView::TestCase
            :projects_trackers,
            :custom_fields_trackers
 
-  def test_filters_options_should_be_ordered
-    set_language_if_valid 'en'
+  def test_filters_options_has_empty_item
     query = IssueQuery.new
     filter_count = query.available_filters.size
     fo = filters_options(query)
     assert_equal filter_count + 1, fo.size
     assert_equal [], fo[0]
-
-    expected_order = [
-      "Status",
-      "Project",
-      "Tracker",
-      "Priority"
-    ]
-    assert_equal expected_order, (fo.map(&:first) & expected_order)
-  end
-
-  def test_filters_options_should_be_ordered_with_custom_fields
-    set_language_if_valid 'en'
-    UserCustomField.create!(
-              :name => 'order test', :field_format => 'string',
-              :is_for_all => true, :is_filter => true
-            )
-    query = IssueQuery.new
-    filter_count = query.available_filters.size
-    fo = filters_options(query)
-    assert_equal filter_count + 1, fo.size
-
-    expected_order = [
-      "Searchable field",
-      "Database",
-      "Project's Development status",
-      "Author's order test",
-      "Assignee's order test"
-    ]
-    assert_equal expected_order, (fo.map(&:first) & expected_order)
   end
 end
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index bf194155e..865f6983c 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -29,8 +29,35 @@ class QueryTest < ActiveSupport::TestCase
            :custom_fields_trackers
 
   def test_available_filters_should_be_ordered
+    set_language_if_valid 'en'
     query = IssueQuery.new
     assert_equal 0, query.available_filters.keys.index('status_id')
+    expected_order = [
+      "Status",
+      "Project",
+      "Tracker",
+      "Priority"
+    ]
+    assert_equal expected_order,
+                 (query.available_filters.values.map{|v| v[:name]} & expected_order)
+  end
+
+  def test_available_filters_with_custom_fields_should_be_ordered
+    set_language_if_valid 'en'
+    UserCustomField.create!(
+              :name => 'order test', :field_format => 'string',
+              :is_for_all => true, :is_filter => true
+            )
+    query = IssueQuery.new
+    expected_order = [
+      "Searchable field",
+      "Database",
+      "Project's Development status",
+      "Author's order test",
+      "Assignee's order test"
+    ]
+    assert_equal expected_order,
+                 (query.available_filters.values.map{|v| v[:name]} & expected_order)
   end
 
   def test_custom_fields_for_all_projects_should_be_available_in_global_queries