mirror of
https://github.com/meineerde/redmine.git
synced 2026-02-22 03:22:05 +00:00
cleanup: rubocop: fix Layout/IndentFirstHashElement in test/functional/repositories_git_controller_test.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@19235 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
parent
7a24a790df
commit
925d5ba5b7
@ -49,7 +49,9 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
def test_create_and_update
|
||||
@request.session[:user_id] = 1
|
||||
assert_difference 'Repository.count' do
|
||||
post :create, :params => {
|
||||
post(
|
||||
:create,
|
||||
:params => {
|
||||
:project_id => 'subproject1',
|
||||
:repository_scm => 'Git',
|
||||
:repository => {
|
||||
@ -57,9 +59,9 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
:is_default => '0',
|
||||
:identifier => 'test-create',
|
||||
:report_last_commit => '1',
|
||||
|
||||
}
|
||||
}
|
||||
)
|
||||
end
|
||||
assert_response 302
|
||||
repository = Repository.order('id DESC').first
|
||||
@ -67,13 +69,15 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
assert_equal '/test', repository.url
|
||||
assert_equal true, repository.report_last_commit
|
||||
|
||||
put :update, :params => {
|
||||
put(
|
||||
:update,
|
||||
:params => {
|
||||
:id => repository.id,
|
||||
:repository => {
|
||||
:report_last_commit => '0'
|
||||
|
||||
}
|
||||
}
|
||||
)
|
||||
assert_response 302
|
||||
repo2 = Repository.find(repository.id)
|
||||
assert_equal false, repo2.report_last_commit
|
||||
@ -93,10 +97,13 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
def test_get_new
|
||||
@request.session[:user_id] = 1
|
||||
@project.repository.destroy
|
||||
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'
|
||||
@ -109,9 +116,7 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
@project.reload
|
||||
assert_equal NUM_REV, @repository.changesets.count
|
||||
|
||||
get :show, :params => {
|
||||
:id => PRJ_ID
|
||||
}
|
||||
get(:show, :params => {:id => PRJ_ID})
|
||||
assert_response :success
|
||||
|
||||
assert_select 'table.entries tbody' do
|
||||
@ -137,11 +142,14 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
@repository.fetch_changesets
|
||||
@project.reload
|
||||
assert_equal NUM_REV, @repository.changesets.count
|
||||
get :show, :params => {
|
||||
get(
|
||||
:show,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:rev => 'test_branch'
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
|
||||
assert_select 'table.entries tbody' do
|
||||
@ -166,11 +174,14 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
"tag00.lightweight",
|
||||
"tag01.annotated",
|
||||
].each do |t1|
|
||||
get :show, :params => {
|
||||
get(
|
||||
:show,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:rev => t1
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
|
||||
assert_select 'table.entries tbody tr'
|
||||
@ -183,11 +194,14 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
@repository.fetch_changesets
|
||||
@project.reload
|
||||
assert_equal NUM_REV, @repository.changesets.count
|
||||
get :show, :params => {
|
||||
get(
|
||||
:show,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash(['images'])[:param]
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
|
||||
assert_select 'table.entries tbody' do
|
||||
@ -202,12 +216,15 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
@repository.fetch_changesets
|
||||
@project.reload
|
||||
assert_equal NUM_REV, @repository.changesets.count
|
||||
get :show, :params => {
|
||||
get(
|
||||
:show,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash(['images'])[:param],
|
||||
:rev => '7234cb2750b63f47bff735edc50a1c0a433c2518'
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
|
||||
assert_select 'table.entries tbody' do
|
||||
@ -217,32 +234,41 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
end
|
||||
|
||||
def test_changes
|
||||
get :changes, :params => {
|
||||
get(
|
||||
:changes,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash(['images', 'edit.png'])[:param]
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
assert_select 'h2', :text => /edit.png/
|
||||
end
|
||||
|
||||
def test_entry_show
|
||||
get :entry, :params => {
|
||||
get(
|
||||
:entry,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
# Line 11
|
||||
assert_select 'tr#L11 td.line-code', :text => /WITHOUT ANY WARRANTY/
|
||||
end
|
||||
|
||||
def test_entry_show_should_render_pagination
|
||||
get :entry, :params => {
|
||||
get(
|
||||
:entry,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash(['README'])[:param]
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
assert_select 'ul.pages li.next', :text => /next/i
|
||||
assert_select 'ul.pages li.previous', :text => /previous/i
|
||||
@ -256,12 +282,15 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
else
|
||||
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
|
||||
['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
|
||||
get :entry, :params => {
|
||||
get(
|
||||
:entry,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash(['latin-1-dir', "test-Ü.txt"])[:param],
|
||||
:rev => r1
|
||||
:path => repository_path_hash(['latin-1-dir', "test-Ü.txt"])[:param],
|
||||
:rev => r1
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
assert_select 'tr#L1 td.line-code', :text => /test-Ü.txt/
|
||||
end
|
||||
@ -270,23 +299,29 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
end
|
||||
|
||||
def test_entry_download
|
||||
get :entry, :params => {
|
||||
get(
|
||||
:entry,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
|
||||
:format => 'raw'
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
# File content
|
||||
assert @response.body.include?('WITHOUT ANY WARRANTY')
|
||||
end
|
||||
|
||||
def test_directory_entry
|
||||
get :entry, :params => {
|
||||
get(
|
||||
:entry,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash(['sources'])[:param]
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
assert_select 'h2 a', :text => 'sources'
|
||||
assert_select 'table.entries tbody'
|
||||
@ -302,12 +337,15 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
assert_equal NUM_REV, @repository.changesets.count
|
||||
# Full diff of changeset 2f9c0091
|
||||
['inline', 'sbs'].each do |dt|
|
||||
get :diff, :params => {
|
||||
get(
|
||||
:diff,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
|
||||
:type => dt
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
# Line 22 removed
|
||||
assert_select 'th.line-num:contains(22) ~ td.diff_out', :text => /def remove/
|
||||
@ -323,13 +361,16 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
with_settings :diff_max_lines_displayed => 1000 do
|
||||
# Full diff of changeset 2f9c0091
|
||||
['inline', 'sbs'].each do |dt|
|
||||
get :diff, :params => {
|
||||
get(
|
||||
:diff,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
|
||||
:path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
|
||||
:type => dt
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
# Line 22 removed
|
||||
assert_select 'th.line-num:contains(22) ~ td.diff_out', :text => /def remove/
|
||||
@ -348,22 +389,28 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
# Truncated diff of changeset 2f9c0091
|
||||
with_cache do
|
||||
with_settings :default_language => 'en' do
|
||||
get :diff, :params => {
|
||||
get(
|
||||
:diff,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:type => 'inline',
|
||||
:rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
assert @response.body.include?("... This diff was truncated")
|
||||
end
|
||||
with_settings :default_language => 'fr' do
|
||||
get :diff, :params => {
|
||||
get(
|
||||
:diff,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:type => 'inline',
|
||||
:rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
assert ! @response.body.include?("... This diff was truncated")
|
||||
assert @response.body.include?("... Ce diff")
|
||||
@ -378,13 +425,16 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
@project.reload
|
||||
assert_equal NUM_REV, @repository.changesets.count
|
||||
['inline', 'sbs'].each do |dt|
|
||||
get :diff, :params => {
|
||||
get(
|
||||
:diff,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:rev => '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
|
||||
:rev_to => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
|
||||
:type => dt
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
assert_select 'h2', :text => /2f9c0091:61b685fb/
|
||||
assert_select 'form[action=?]', "/projects/subproject1/repository/#{@repository.id}/revisions/61b685fbe55ab05b5ac68402d5720c1a6ac973d1/diff"
|
||||
@ -404,13 +454,16 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
assert repo
|
||||
assert_equal false, repo.is_default
|
||||
assert_equal 'test-diff-path', repo.identifier
|
||||
get :diff, :params => {
|
||||
get(
|
||||
:diff,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => 'test-diff-path',
|
||||
:rev => '61b685fbe55ab05b',
|
||||
:rev_to => '2f9c0091c754a91a',
|
||||
:type => 'inline'
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
assert_select 'form[action=?]', '/projects/subproject1/repository/test-diff-path/revisions/61b685fbe55ab05b/diff'
|
||||
assert_select 'input#rev_to[type=hidden][name=rev_to][value=?]', '2f9c0091c754a91a'
|
||||
@ -423,12 +476,15 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
|
||||
['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
|
||||
['inline', 'sbs'].each do |dt|
|
||||
get :diff, :params => {
|
||||
get(
|
||||
:diff,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:rev => r1,
|
||||
:type => dt
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
assert_select 'table' do
|
||||
assert_select 'thead th.filename', :text => /latin-1-dir\/test-Ü.txt/
|
||||
@ -441,12 +497,15 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
end
|
||||
|
||||
def test_diff_should_show_filenames
|
||||
get :diff, :params => {
|
||||
get(
|
||||
:diff,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:rev => 'deff712f05a90d96edbd70facc47d944be5897e3',
|
||||
:type => 'inline'
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
# modified file
|
||||
assert_select 'th.filename', :text => 'sources/watchers_controller.rb'
|
||||
@ -462,31 +521,40 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
assert_nil user.pref[:diff_type]
|
||||
|
||||
@request.session[:user_id] = 1 # admin
|
||||
get :diff, :params => {
|
||||
get(
|
||||
:diff,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
user.reload
|
||||
assert_equal "inline", user.pref[:diff_type]
|
||||
get :diff, :params => {
|
||||
get(
|
||||
:diff,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
|
||||
:type => 'sbs'
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
user.reload
|
||||
assert_equal "sbs", user.pref[:diff_type]
|
||||
end
|
||||
|
||||
def test_annotate
|
||||
get :annotate, :params => {
|
||||
get(
|
||||
:annotate,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
|
||||
# Line 23, changeset 2f9c0091
|
||||
@ -503,23 +571,29 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
@repository.fetch_changesets
|
||||
@project.reload
|
||||
assert_equal NUM_REV, @repository.changesets.count
|
||||
get :annotate, :params => {
|
||||
get(
|
||||
:annotate,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:rev => 'deff7',
|
||||
:path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
assert_select 'h2', :text => /@ deff712f/
|
||||
end
|
||||
|
||||
def test_annotate_binary_file
|
||||
with_settings :default_language => 'en' do
|
||||
get :annotate, :params => {
|
||||
get(
|
||||
:annotate,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash(['images', 'edit.png'])[:param]
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
assert_select 'p#errorExplanation', :text => /cannot be annotated/
|
||||
end
|
||||
@ -527,21 +601,27 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
|
||||
def test_annotate_error_when_too_big
|
||||
with_settings :file_max_size_displayed => 1 do
|
||||
get :annotate, :params => {
|
||||
get(
|
||||
:annotate,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
|
||||
:rev => 'deff712f'
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
assert_select 'p#errorExplanation', :text => /exceeds the maximum text file size/
|
||||
|
||||
get :annotate, :params => {
|
||||
get(
|
||||
:annotate,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash(['README'])[:param],
|
||||
:rev => '7234cb2'
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
end
|
||||
end
|
||||
@ -554,12 +634,15 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
else
|
||||
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
|
||||
['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
|
||||
get :annotate, :params => {
|
||||
get(
|
||||
:annotate,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash(['latin-1-dir', "test-Ü.txt"])[:param],
|
||||
:rev => r1
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash(['latin-1-dir', "test-Ü.txt"])[:param],
|
||||
:rev => r1
|
||||
}
|
||||
)
|
||||
assert_select "th.line-num", :text => '1' do
|
||||
assert_select "+ td.revision" do
|
||||
assert_select "a", :text => '57ca437c'
|
||||
@ -576,12 +659,15 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
|
||||
def test_annotate_latin_1_author
|
||||
['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', '83ca5fd546063a'].each do |r1|
|
||||
get :annotate, :params => {
|
||||
get(
|
||||
:annotate,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:path => repository_path_hash([" filename with a leading space.txt "])[:param],
|
||||
:rev => r1
|
||||
}
|
||||
)
|
||||
assert_select "th.line-num", :text => '1' do
|
||||
assert_select "+ td.revision" do
|
||||
assert_select "a", :text => '83ca5fd5'
|
||||
@ -599,10 +685,13 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
@repository.fetch_changesets
|
||||
@project.reload
|
||||
assert_equal NUM_REV, @repository.changesets.count
|
||||
get :revisions, :params => {
|
||||
get(
|
||||
:revisions,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id
|
||||
}
|
||||
)
|
||||
assert_select 'form[method=get][action=?]', "/projects/subproject1/repository/#{@repository.id}/revision"
|
||||
end
|
||||
|
||||
@ -612,11 +701,14 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
@project.reload
|
||||
assert_equal NUM_REV, @repository.changesets.count
|
||||
['61b685fbe55ab05b5ac68402d5720c1a6ac973d1', '61b685f'].each do |r|
|
||||
get :revision, :params => {
|
||||
get(
|
||||
:revision,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:rev => r
|
||||
}
|
||||
)
|
||||
assert_response :success
|
||||
end
|
||||
end
|
||||
@ -627,11 +719,14 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
@project.reload
|
||||
assert_equal NUM_REV, @repository.changesets.count
|
||||
['', ' ', nil].each do |r|
|
||||
get :revision, :params => {
|
||||
get(
|
||||
:revision,
|
||||
:params => {
|
||||
:id => PRJ_ID,
|
||||
:repository_id => @repository.id,
|
||||
:rev => r
|
||||
}
|
||||
)
|
||||
assert_response 404
|
||||
assert_select_error /was not found/
|
||||
end
|
||||
@ -645,9 +740,12 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
assert_equal NUM_REV, @repository.changesets.count
|
||||
|
||||
assert_difference 'Repository.count', -1 do
|
||||
delete :destroy, :params => {
|
||||
delete(
|
||||
:destroy,
|
||||
:params => {
|
||||
:id => @repository.id
|
||||
}
|
||||
)
|
||||
end
|
||||
assert_response 302
|
||||
@project.reload
|
||||
@ -669,9 +767,12 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
|
||||
assert_equal 0, @repository.changesets.count
|
||||
|
||||
assert_difference 'Repository.count', -1 do
|
||||
delete :destroy, :params => {
|
||||
delete(
|
||||
:destroy,
|
||||
:params => {
|
||||
:id => @repository.id
|
||||
}
|
||||
)
|
||||
end
|
||||
assert_response 302
|
||||
@project.reload
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user