From 5b1073095a2a8d0c734f9367c333b3df68f087a1 2013-12-07 03:51:26
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: 2013-12-07 03:51:26
Subject: [PATCH] Merged r12367 and r12368 from trunk to 2.4-stable

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12369 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index d9c1e40..6fa4253 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -293,7 +293,7 @@ class IssuesControllerTest < ActionController::TestCase
     end
   end
 
-  def test_index_with_query_grouped_by_tracker
+  def test_index_with_query_grouped_by_tracker_in_normal_order
     3.times {|i| Issue.generate!(:tracker_id => (i + 1))}
 
     get :index, :set_filter => 1, :group_by => 'tracker', :sort => 'id:desc'
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 5959da1..45ce79a 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -33,12 +33,6 @@ class UsersControllerTest < ActionController::TestCase
     get :index
     assert_response :success
     assert_template 'index'
-  end
-
-  def test_index
-    get :index
-    assert_response :success
-    assert_template 'index'
     assert_not_nil assigns(:users)
     # active users only
     assert_nil assigns(:users).detect {|u| !u.active?}