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 d9c1e40da728b788931e69b19d1296570a29ff90..6fa4253f9b8f8f78d3801d2f64d2b8fee1932447 100644 (file)
--- 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 5959da10ea891fefdace9072fda3ce201222f437..45ce79a86c58bc819e1aef2b84c06963d505beba 100644 (file)
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -29,12 +29,6 @@ class UsersControllerTest < ActionController::TestCase
     @request.session[:user_id] = 1 # admin
   end
 
-  def test_index
-    get :index
-    assert_response :success
-    assert_template 'index'
-  end
-
   def test_index
     get :index
     assert_response :success