From 78c7603cdce067d701bb15396bc928b2e95efe2f Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 24 Nov 2019 16:45:33 +0000 Subject: [PATCH] cleanup: rubocop: fix Layout/IndentFirstHashElement in test/functional/issue_categories_controller_test.rb git-svn-id: http://svn.redmine.org/redmine/trunk@19274 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../issue_categories_controller_test.rb | 67 ++++++++++++------- 1 file changed, 44 insertions(+), 23 deletions(-) diff --git a/test/functional/issue_categories_controller_test.rb b/test/functional/issue_categories_controller_test.rb index 972d5a15c..478241608 100644 --- a/test/functional/issue_categories_controller_test.rb +++ b/test/functional/issue_categories_controller_test.rb @@ -30,20 +30,20 @@ class IssueCategoriesControllerTest < Redmine::ControllerTest def test_new @request.session[:user_id] = 2 # manager - get :new, :params => { - :project_id => '1' - } + get(:new, :params => {:project_id => '1'}) assert_response :success assert_select 'input[name=?]', 'issue_category[name]' end def test_new_from_issue_form @request.session[:user_id] = 2 # manager - get :new, :params => { + get( + :new, + :params => { :project_id => '1' }, :xhr => true - + ) assert_response :success assert_equal 'text/javascript', response.content_type end @@ -51,12 +51,15 @@ class IssueCategoriesControllerTest < Redmine::ControllerTest def test_create @request.session[:user_id] = 2 # manager assert_difference 'IssueCategory.count' do - post :create, :params => { + post( + :create, + :params => { :project_id => '1', :issue_category => { :name => 'New category' } } + ) end assert_redirected_to '/projects/ecookbook/settings/categories' category = IssueCategory.find_by_name('New category') @@ -66,12 +69,15 @@ class IssueCategoriesControllerTest < Redmine::ControllerTest def test_create_failure @request.session[:user_id] = 2 - post :create, :params => { + post( + :create, + :params => { :project_id => '1', :issue_category => { :name => '' } } + ) assert_response :success assert_select_error /Name cannot be blank/i end @@ -79,13 +85,16 @@ class IssueCategoriesControllerTest < Redmine::ControllerTest def test_create_from_issue_form @request.session[:user_id] = 2 # manager assert_difference 'IssueCategory.count' do - post :create, :params => { + post( + :create, + :params => { :project_id => '1', :issue_category => { :name => 'New category' } }, :xhr => true + ) end category = IssueCategory.order('id DESC').first assert_equal 'New category', category.name @@ -97,13 +106,16 @@ class IssueCategoriesControllerTest < Redmine::ControllerTest def test_create_from_issue_form_with_failure @request.session[:user_id] = 2 # manager assert_no_difference 'IssueCategory.count' do - post :create, :params => { + post( + :create, + :params => { :project_id => '1', :issue_category => { :name => '' } }, :xhr => true + ) end assert_response :success @@ -113,59 +125,62 @@ class IssueCategoriesControllerTest < Redmine::ControllerTest def test_edit @request.session[:user_id] = 2 - get :edit, :params => { - :id => 2 - } + get(:edit, :params => {:id => 2}) assert_response :success assert_select 'input[name=?][value=?]', 'issue_category[name]', 'Recipes' end def test_update assert_no_difference 'IssueCategory.count' do - put :update, :params => { + put( + :update, + :params => { :id => 2, :issue_category => { :name => 'Testing' } } + ) end assert_redirected_to '/projects/ecookbook/settings/categories' assert_equal 'Testing', IssueCategory.find(2).name end def test_update_failure - put :update, :params => { + put( + :update, + :params => { :id => 2, :issue_category => { :name => '' } } + ) assert_response :success assert_select_error /Name cannot be blank/i end def test_update_not_found - put :update, :params => { + put( + :update, + :params => { :id => 97, :issue_category => { :name => 'Testing' } } + ) assert_response 404 end def test_destroy_category_not_in_use - delete :destroy, :params => { - :id => 2 - } + delete(:destroy, :params => {:id => 2}) assert_redirected_to '/projects/ecookbook/settings/categories' assert_nil IssueCategory.find_by_id(2) end def test_destroy_category_in_use - delete :destroy, :params => { - :id => 1 - } + delete(:destroy, :params => {:id => 1}) assert_response :success assert_not_nil IssueCategory.find_by_id(1) assert_select 'select[name=?]', 'reassign_to_id' @@ -173,11 +188,14 @@ class IssueCategoriesControllerTest < Redmine::ControllerTest def test_destroy_category_in_use_with_reassignment issue = Issue.where(:category_id => 1).first - delete :destroy, :params => { + delete( + :destroy, + :params => { :id => 1, :todo => 'reassign', :reassign_to_id => 2 } + ) assert_redirected_to '/projects/ecookbook/settings/categories' assert_nil IssueCategory.find_by_id(1) # check that the issue was reassign @@ -186,10 +204,13 @@ class IssueCategoriesControllerTest < Redmine::ControllerTest def test_destroy_category_in_use_without_reassignment issue = Issue.where(:category_id => 1).first - delete :destroy, :params => { + delete( + :destroy, + :params => { :id => 1, :todo => 'nullify' } + ) assert_redirected_to '/projects/ecookbook/settings/categories' assert_nil IssueCategory.find_by_id(1) # check that the issue category was nullified -- 2.39.5