From 9dd4cf2ea7d4473e8562e8c0ba851c9c9f236312 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 24 Nov 2019 16:46:14 +0000 Subject: [PATCH] cleanup: rubocop: fix Layout/IndentFirstHashElement in test/functional/repositories_controller_test.rb git-svn-id: http://svn.redmine.org/redmine/trunk@19278 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../repositories_controller_test.rb | 162 +++++++++++------- 1 file changed, 97 insertions(+), 65 deletions(-) diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb index 3bf0e23d6..b7d8fad32 100644 --- a/test/functional/repositories_controller_test.rb +++ b/test/functional/repositories_controller_test.rb @@ -31,9 +31,12 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest def test_new @request.session[:user_id] = 1 - get :new, :params => { + get( + :new, + :params => { :project_id => 'subproject1' } + ) assert_response :success assert_select 'select[name=?]', 'repository_scm' do assert_select 'option[value=?][selected=selected]', 'Subversion' @@ -44,12 +47,14 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest def test_new_should_propose_enabled_scm_only @request.session[:user_id] = 1 with_settings :enabled_scm => ['Mercurial', 'Git'] do - get :new, :params => { + get( + :new, + :params => { :project_id => 'subproject1' } + ) end assert_response :success - assert_select 'select[name=repository_scm]' do assert_select 'option', 3 assert_select 'option[value=Mercurial][selected=selected]' @@ -59,12 +64,14 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest def test_get_new_with_type @request.session[:user_id] = 1 - get :new, :params => { + get( + :new, + :params => { :project_id => 'subproject1', :repository_scm => 'Git' } + ) assert_response :success - assert_select 'select[name=?]', 'repository_scm' do assert_select 'option[value=?][selected=selected]', 'Git' end @@ -73,7 +80,9 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest def test_create @request.session[:user_id] = 1 assert_difference 'Repository.count' do - post :create, :params => { + post( + :create, + :params => { :project_id => 'subproject1', :repository_scm => 'Subversion', :repository => { @@ -82,6 +91,7 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest :identifier => '' } } + ) end assert_response 302 repository = Repository.order('id DESC').first @@ -92,13 +102,16 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest def test_create_with_failure @request.session[:user_id] = 1 assert_no_difference 'Repository.count' do - post :create, :params => { + post( + :create, + :params => { :project_id => 'subproject1', :repository_scm => 'Subversion', :repository => { :url => 'invalid' } } + ) end assert_response :success assert_select_error /URL is invalid/ @@ -109,33 +122,37 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest def test_edit @request.session[:user_id] = 1 - get :edit, :params => { - :id => 11 - } + get(:edit, :params => {:id => 11}) assert_response :success assert_select 'input[name=?][value=?][disabled=disabled]', 'repository[url]', 'svn://localhost/test' end def test_update @request.session[:user_id] = 1 - put :update, :params => { + put( + :update, + :params => { :id => 11, :repository => { :password => 'test_update' } } + ) assert_response 302 assert_equal 'test_update', Repository.find(11).password end def test_update_with_failure @request.session[:user_id] = 1 - put :update, :params => { + put( + :update, + :params => { :id => 11, :repository => { :password => 'x'*260 } } + ) assert_response :success assert_select_error /Password is too long/ end @@ -143,9 +160,7 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest def test_destroy @request.session[:user_id] = 1 assert_difference 'Repository.count', -1 do - delete :destroy, :params => { - :id => 11 - } + delete(:destroy, :params => {:id => 11}) end assert_response 302 assert_nil Repository.find_by_id(11) @@ -153,32 +168,23 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest def test_show_with_autofetch_changesets_enabled_should_fetch_changesets Repository::Subversion.any_instance.expects(:fetch_changesets).once - with_settings :autofetch_changesets => '1' do - get :show, :params => { - :id => 1 - } + get(:show, :params => {:id => 1}) end end def test_show_with_autofetch_changesets_disabled_should_not_fetch_changesets Repository::Subversion.any_instance.expects(:fetch_changesets).never - with_settings :autofetch_changesets => '0' do - get :show, :params => { - :id => 1 - } + get(:show, :params => {:id => 1}) end end def test_show_with_closed_project_should_not_fetch_changesets Repository::Subversion.any_instance.expects(:fetch_changesets).never Project.find(1).close - with_settings :autofetch_changesets => '1' do - get :show, :params => { - :id => 1 - } + get(:show, :params => {:id => 1}) end end @@ -188,68 +194,77 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest role = Role.find(1) role.add_permission! :browse_repository - get :show, :params => { - :id => 1 - } + get(:show, :params => {:id => 1}) assert_response :success assert_select 'input[value="View differences"]' role.remove_permission! :browse_repository - get :show, :params => { - :id => 1 - } + get(:show, :params => {:id => 1}) assert_response :success assert_select 'input[value="View differences"]', :count => 0 end end def test_revisions - get :revisions, :params => { + get( + :revisions, + :params => { :id => 1, :repository_id => 10 } + ) assert_response :success assert_select 'table.changesets' end def test_revisions_for_other_repository repository = Repository::Subversion.create!(:project_id => 1, :identifier => 'foo', :url => 'file:///foo') - - get :revisions, :params => { + get( + :revisions, + :params => { :id => 1, :repository_id => 'foo' } + ) assert_response :success assert_select 'table.changesets' end def test_revisions_for_invalid_repository - get :revisions, :params => { + get( + :revisions, + :params => { :id => 1, :repository_id => 'foo' } + ) assert_response 404 end def test_revision - get :revision, :params => { + get( + :revision, + :params => { :id => 1, :repository_id => 10, :rev => 1 } + ) assert_response :success assert_select 'h2', :text => 'Revision 1' end def test_revision_should_not_format_comments_when_disabled Changeset.where(:id => 100).update_all(:comments => 'Simple *text*') - with_settings :commit_logs_formatting => '0' do - get :revision, :params => { + get( + :revision, + :params => { :id => 1, :repository_id => 10, :rev => 1 } + ) assert_response :success assert_select '.changeset-comments', :text => 'Simple *text*' end @@ -258,38 +273,43 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest def test_revision_should_show_add_related_issue_form Role.find(1).add_permission! :manage_related_issues @request.session[:user_id] = 2 - - get :revision, :params => { + get( + :revision, + :params => { :id => 1, :repository_id => 10, :rev => 1 } + ) assert_response :success - assert_select 'form[action=?]', '/projects/ecookbook/repository/10/revisions/1/issues' do assert_select 'input[name=?]', 'issue_id' end end def test_revision_should_not_change_the_project_menu_link - get :revision, :params => { + get( + :revision, + :params => { :id => 1, :repository_id => 10, :rev => 1 } + ) assert_response :success - assert_select '#main-menu a.repository[href=?]', '/projects/ecookbook/repository' end def test_revision_with_before_nil_and_afer_normal - get :revision, :params => { + get( + :revision, + :params => { :id => 1, :repository_id => 10, :rev => 1 } + ) assert_response :success - assert_select 'div.contextual' do assert_select 'a[href=?]', '/projects/ecookbook/repository/10/revisions/0', 0 assert_select 'a[href=?]', '/projects/ecookbook/repository/10/revisions/2' @@ -299,7 +319,9 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest def test_add_related_issue @request.session[:user_id] = 2 assert_difference 'Changeset.find(103).issues.size' do - post :add_related_issue, :params => { + post( + :add_related_issue, + :params => { :id => 1, :repository_id => 10, :rev => 4, @@ -307,6 +329,7 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest :format => 'js' }, :xhr => true + ) assert_response :success assert_equal 'text/javascript', response.content_type end @@ -318,7 +341,9 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest def test_add_related_issue_should_accept_issue_id_with_sharp @request.session[:user_id] = 2 assert_difference 'Changeset.find(103).issues.size' do - post :add_related_issue, :params => { + post( + :add_related_issue, + :params => { :id => 1, :repository_id => 10, :rev => 4, @@ -326,6 +351,7 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest :format => 'js' }, :xhr => true + ) end assert_equal [2], Changeset.find(103).issue_ids end @@ -333,7 +359,9 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest def test_add_related_issue_with_invalid_issue_id @request.session[:user_id] = 2 assert_no_difference 'Changeset.find(103).issues.size' do - post :add_related_issue, :params => { + post( + :add_related_issue, + :params => { :id => 1, :repository_id => 10, :rev => 4, @@ -341,6 +369,7 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest :format => 'js' }, :xhr => true + ) assert_response :success assert_equal 'text/javascript', response.content_type end @@ -350,10 +379,11 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest def test_remove_related_issue Changeset.find(103).issues << Issue.find(1) Changeset.find(103).issues << Issue.find(2) - @request.session[:user_id] = 2 assert_difference 'Changeset.find(103).issues.size', -1 do - delete :remove_related_issue, :params => { + delete( + :remove_related_issue, + :params => { :id => 1, :repository_id => 10, :rev => 4, @@ -361,6 +391,7 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest :format => 'js' }, :xhr => true + ) assert_response :success assert_equal 'text/javascript', response.content_type end @@ -373,12 +404,14 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest latest = Project.find(1).repository.changesets.maximum(:commit_date) assert_not_nil latest Date.stubs(:today).returns(latest.to_date + 10) - - get :graph, :params => { + get( + :graph, + :params => { :id => 1, :repository_id => 10, :graph => 'commits_per_month' } + ) assert_response :success assert_equal 'application/json', response.content_type data = ActiveSupport::JSON.decode(response.body) @@ -388,11 +421,14 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest end def test_graph_commits_per_author - get :graph, :params => { + get( + :graph, + :params => { :id => 1, :repository_id => 10, :graph => 'commits_per_author' } + ) assert_response :success assert_equal 'application/json', response.content_type data = ActiveSupport::JSON.decode(response.body) @@ -411,12 +447,8 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest :revision => 100, :comments => 'Committed by foo.' ) - - get :committers, :params => { - :id => 10 - } + get(:committers, :params => {:id => 10}) assert_response :success - assert_select 'input[value=dlopper] + select option[value="3"][selected=selected]', :text => 'Dave Lopper' assert_select 'input[value=foo] + select option[selected=selected]', 0 # no option selected end @@ -424,10 +456,7 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest def test_get_committers_without_changesets Changeset.delete_all @request.session[:user_id] = 2 - - get :committers, :params => { - :id => 10 - } + get(:committers, :params => {:id => 10}) assert_response :success end @@ -442,12 +471,15 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest :comments => 'Committed by foo.' ) assert_no_difference "Changeset.where(:user_id => 3).count" do - post :committers, :params => { + post( + :committers, + :params => { :id => 10, :committers => { '0' => ['foo', '2'], '1' => ['dlopper', '3'] } } + ) assert_response 302 assert_equal User.find(2), c.reload.user end -- 2.39.5