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
This commit is contained in:
parent
6d33524888
commit
5b1073095a
@ -293,7 +293,7 @@ class IssuesControllerTest < ActionController::TestCase
|
|||||||
end
|
end
|
||||||
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))}
|
3.times {|i| Issue.generate!(:tracker_id => (i + 1))}
|
||||||
|
|
||||||
get :index, :set_filter => 1, :group_by => 'tracker', :sort => 'id:desc'
|
get :index, :set_filter => 1, :group_by => 'tracker', :sort => 'id:desc'
|
||||||
|
@ -29,12 +29,6 @@ class UsersControllerTest < ActionController::TestCase
|
|||||||
@request.session[:user_id] = 1 # admin
|
@request.session[:user_id] = 1 # admin
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_index
|
|
||||||
get :index
|
|
||||||
assert_response :success
|
|
||||||
assert_template 'index'
|
|
||||||
end
|
|
||||||
|
|
||||||
def test_index
|
def test_index
|
||||||
get :index
|
get :index
|
||||||
assert_response :success
|
assert_response :success
|
||||||
|
Loading…
x
Reference in New Issue
Block a user