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

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

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

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8926 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2012-02-23 07:33:44 +00:00
parent 1e7340b448
commit 00ec4e189f
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/functional/repositories_cvs_controller_test.rb
View File

@ -79,7 +79,7 @@ class RepositoriesCvsControllerTest < 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)
@ -95,7 +95,8 @@ class RepositoriesCvsControllerTest < 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'], :rev => 1 get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param],
:rev => 1
assert_response :success assert_response :success
assert_template 'show' assert_template 'show'
assert_not_nil assigns(:entries) assert_not_nil assigns(:entries)
@ -107,7 +108,8 @@ class RepositoriesCvsControllerTest < 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 :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'
assert_no_tag :tag => 'td', assert_no_tag :tag => 'td',
@ -121,7 +123,9 @@ class RepositoriesCvsControllerTest < 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 :entry, :id => PRJ_ID, :path => ['sources', 'watchers_controller.rb'], :rev => 2 get :entry, :id => PRJ_ID,
:path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
:rev => 2
assert_response :success assert_response :success
assert_template 'entry' assert_template 'entry'
# this line was removed in r3 # this line was removed in r3
@ -135,7 +139,8 @@ class RepositoriesCvsControllerTest < 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 :entry, :id => PRJ_ID, :path => ['sources', 'zzz.c'] get :entry, :id => PRJ_ID,
:path => repository_path_hash(['sources', 'zzz.c'])[:param]
assert_tag :tag => 'p', assert_tag :tag => 'p',
:attributes => { :id => /errorExplanation/ }, :attributes => { :id => /errorExplanation/ },
:content => /The entry or revision was not found in the repository/ :content => /The entry or revision was not found in the repository/
@ -146,7 +151,8 @@ class RepositoriesCvsControllerTest < 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 :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
end end
@ -156,7 +162,8 @@ class RepositoriesCvsControllerTest < 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 :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)
@ -206,7 +213,8 @@ class RepositoriesCvsControllerTest < 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 :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'
# 1.1 line # 1.1 line