kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rails3: test: scm: git: use "repository_path_hash" for path param 

Rails3 new route format returns path param as string not array.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8924 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2012-02-23 06:12:22 +00:00
parent 21cb2ee817
commit 08811bd259
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
test/functional/repositories_git_controller_test.rb
View File

@ -134,7 +134,7 @@ class RepositoriesGitControllerTest < ActionController::TestCase
@repository.fetch_changesets @repository.fetch_changesets
@project.reload @project.reload
assert_equal NUM_REV, @repository.changesets.count assert_equal NUM_REV, @repository.changesets.count
get :show, :id => PRJ_ID, :path => ['images'] get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param]
assert_response :success assert_response :success
assert_template 'show' assert_template 'show'
assert_not_nil assigns(:entries) assert_not_nil assigns(:entries)
@ -152,7 +152,7 @@ class RepositoriesGitControllerTest < ActionController::TestCase
@repository.fetch_changesets @repository.fetch_changesets
@project.reload @project.reload
assert_equal NUM_REV, @repository.changesets.count assert_equal NUM_REV, @repository.changesets.count
get :show, :id => PRJ_ID, :path => ['images'], get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param],
:rev => '7234cb2750b63f47bff735edc50a1c0a433c2518' :rev => '7234cb2750b63f47bff735edc50a1c0a433c2518'
assert_response :success assert_response :success
assert_template 'show' assert_template 'show'
@ -163,14 +163,16 @@ class RepositoriesGitControllerTest < ActionController::TestCase
end end
def test_changes def test_changes
get :changes, :id => PRJ_ID, :path => ['images', 'edit.png'] get :changes, :id => PRJ_ID,
:path => repository_path_hash(['images', 'edit.png'])[:param]
assert_response :success assert_response :success
assert_template 'changes' assert_template 'changes'
assert_tag :tag => 'h2', :content => 'edit.png' assert_tag :tag => 'h2', :content => 'edit.png'
end end
def test_entry_show def test_entry_show
get :entry, :id => PRJ_ID, :path => ['sources', 'watchers_controller.rb'] get :entry, :id => PRJ_ID,
:path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
assert_response :success assert_response :success
assert_template 'entry' assert_template 'entry'
# Line 19 # Line 19
@ -189,7 +191,8 @@ class RepositoriesGitControllerTest < ActionController::TestCase
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1| ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
get :entry, :id => PRJ_ID, get :entry, :id => PRJ_ID,
:path => ['latin-1-dir', "test-#{@char_1}.txt"], :rev => r1 :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
:rev => r1
assert_response :success assert_response :success
assert_template 'entry' assert_template 'entry'
assert_tag :tag => 'th', assert_tag :tag => 'th',
@ -203,7 +206,8 @@ class RepositoriesGitControllerTest < ActionController::TestCase
end end
def test_entry_download def test_entry_download
get :entry, :id => PRJ_ID, :path => ['sources', 'watchers_controller.rb'], get :entry, :id => PRJ_ID,
:path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
:format => 'raw' :format => 'raw'
assert_response :success assert_response :success
# File content # File content
@ -211,7 +215,8 @@ class RepositoriesGitControllerTest < ActionController::TestCase
end end
def test_directory_entry def test_directory_entry
get :entry, :id => PRJ_ID, :path => ['sources'] get :entry, :id => PRJ_ID,
:path => repository_path_hash(['sources'])[:param]
assert_response :success assert_response :success
assert_template 'show' assert_template 'show'
assert_not_nil assigns(:entry) assert_not_nil assigns(:entry)
@ -334,7 +339,8 @@ class RepositoriesGitControllerTest < ActionController::TestCase
end end
def test_annotate def test_annotate
get :annotate, :id => PRJ_ID, :path => ['sources', 'watchers_controller.rb'] get :annotate, :id => PRJ_ID,
:path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
assert_response :success assert_response :success
assert_template 'annotate' assert_template 'annotate'
# Line 24, changeset 2f9c0091 # Line 24, changeset 2f9c0091
@ -366,14 +372,15 @@ class RepositoriesGitControllerTest < ActionController::TestCase
@project.reload @project.reload
assert_equal NUM_REV, @repository.changesets.count assert_equal NUM_REV, @repository.changesets.count
get :annotate, :id => PRJ_ID, :rev => 'deff7', get :annotate, :id => PRJ_ID, :rev => 'deff7',
:path => ['sources', 'watchers_controller.rb'] :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
assert_response :success assert_response :success
assert_template 'annotate' assert_template 'annotate'
assert_tag :tag => 'h2', :content => /@ deff712f/ assert_tag :tag => 'h2', :content => /@ deff712f/
end end
def test_annotate_binary_file def test_annotate_binary_file
get :annotate, :id => PRJ_ID, :path => ['images', 'edit.png'] get :annotate, :id => PRJ_ID,
:path => repository_path_hash(['images', 'edit.png'])[:param]
assert_response 500 assert_response 500
assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ }, assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
:content => /cannot be annotated/ :content => /cannot be annotated/
@ -381,12 +388,16 @@ class RepositoriesGitControllerTest < ActionController::TestCase
def test_annotate_error_when_too_big def test_annotate_error_when_too_big
with_settings :file_max_size_displayed => 1 do with_settings :file_max_size_displayed => 1 do
get :annotate, :id => PRJ_ID, :path => ['sources', 'watchers_controller.rb'], :rev => 'deff712f' get :annotate, :id => PRJ_ID,
:path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
:rev => 'deff712f'
assert_response 500 assert_response 500
assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ }, assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
:content => /exceeds the maximum text file size/ :content => /exceeds the maximum text file size/
get :annotate, :id => PRJ_ID, :path => ['README'], :rev => '7234cb2' get :annotate, :id => PRJ_ID,
:path => repository_path_hash(['README'])[:param],
:rev => '7234cb2'
assert_response :success assert_response :success
assert_template 'annotate' assert_template 'annotate'
end end
@ -401,7 +412,8 @@ class RepositoriesGitControllerTest < ActionController::TestCase
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1| ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
get :annotate, :id => PRJ_ID, get :annotate, :id => PRJ_ID,
:path => ['latin-1-dir', "test-#{@char_1}.txt"], :rev => r1 :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
:rev => r1
assert_tag :tag => 'th', assert_tag :tag => 'th',
:content => '1', :content => '1',
:attributes => { :class => 'line-num' }, :attributes => { :class => 'line-num' },