##// END OF EJS Templates
Merged r12367 and r12368 from trunk to 2.4-stable...
Toshi MARUYAMA -
r12114:5b1073095a2a
parent child
Show More
@@ -293,7 +293,7 class IssuesControllerTest < ActionController::TestCase
293 end
293 end
294 end
294 end
295
295
296 def test_index_with_query_grouped_by_tracker
296 def test_index_with_query_grouped_by_tracker_in_normal_order
297 3.times {|i| Issue.generate!(:tracker_id => (i + 1))}
297 3.times {|i| Issue.generate!(:tracker_id => (i + 1))}
298
298
299 get :index, :set_filter => 1, :group_by => 'tracker', :sort => 'id:desc'
299 get :index, :set_filter => 1, :group_by => 'tracker', :sort => 'id:desc'
@@ -33,12 +33,6 class UsersControllerTest < ActionController::TestCase
33 get :index
33 get :index
34 assert_response :success
34 assert_response :success
35 assert_template 'index'
35 assert_template 'index'
36 end
37
38 def test_index
39 get :index
40 assert_response :success
41 assert_template 'index'
42 assert_not_nil assigns(:users)
36 assert_not_nil assigns(:users)
43 # active users only
37 # active users only
44 assert_nil assigns(:users).detect {|u| !u.active?}
38 assert_nil assigns(:users).detect {|u| !u.active?}
General Comments 0
You need to be logged in to leave comments. Login now