##// END OF EJS Templates
backout r10707 (#12196)...
Toshi MARUYAMA -
r10496:2beae77c5871
parent child
Show More
@@ -221,9 +221,7 RedmineApp::Application.routes.draw do
221 :to => 'repositories#changes'
221 :to => 'repositories#changes'
222
222
223 get 'projects/:id/repository/:repository_id/revisions/:rev', :to => 'repositories#revision'
223 get 'projects/:id/repository/:repository_id/revisions/:rev', :to => 'repositories#revision'
224 match 'projects/:id/repository/:repository_id/revision',
224 get 'projects/:id/repository/:repository_id/revision', :to => 'repositories#revision'
225 :to => 'repositories#revision',
226 :via => [:get, :post]
227 post 'projects/:id/repository/:repository_id/revisions/:rev/issues', :to => 'repositories#add_related_issue'
225 post 'projects/:id/repository/:repository_id/revisions/:rev/issues', :to => 'repositories#add_related_issue'
228 delete 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
226 delete 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
229 get 'projects/:id/repository/:repository_id/revisions', :to => 'repositories#revisions'
227 get 'projects/:id/repository/:repository_id/revisions', :to => 'repositories#revisions'
@@ -243,8 +241,7 RedmineApp::Application.routes.draw do
243
241
244 get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
242 get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
245 get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
243 get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
246 match 'projects/:id/repository/revision', :to => 'repositories#revision',
244 get 'projects/:id/repository/revision', :to => 'repositories#revision'
247 :via => [:get, :post]
248 post 'projects/:id/repository/revisions/:rev/issues', :to => 'repositories#add_related_issue'
245 post 'projects/:id/repository/revisions/:rev/issues', :to => 'repositories#add_related_issue'
249 delete 'projects/:id/repository/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
246 delete 'projects/:id/repository/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
250 get 'projects/:id/repository/revisions/:rev/:action(/*path(.:ext))',
247 get 'projects/:id/repository/revisions/:rev/:action(/*path(.:ext))',
@@ -321,13 +321,11 class RoutingRepositoriesTest < ActionController::IntegrationTest
321 { :controller => 'repositories', :action => 'changes', :id => 'redmine',
321 { :controller => 'repositories', :action => 'changes', :id => 'redmine',
322 :path => @path_hash[:param] }
322 :path => @path_hash[:param] }
323 )
323 )
324 ["get", "post"].each do |method|
324 assert_routing(
325 assert_routing(
325 { :method => 'get',
326 { :method => method,
326 :path => "/projects/redmine/repository/revision" },
327 :path => "/projects/redmine/repository/revision" },
327 { :controller => 'repositories', :action => 'revision', :id => 'redmine' }
328 { :controller => 'repositories', :action => 'revision', :id => 'redmine' }
328 )
329 )
330 end
331 end
329 end
332
330
333 def test_repositories_non_revisions_path_with_repository_id
331 def test_repositories_non_revisions_path_with_repository_id
@@ -394,13 +392,11 class RoutingRepositoriesTest < ActionController::IntegrationTest
394 { :controller => 'repositories', :action => 'changes', :id => 'redmine', :repository_id => 'foo',
392 { :controller => 'repositories', :action => 'changes', :id => 'redmine', :repository_id => 'foo',
395 :path => @path_hash[:param] }
393 :path => @path_hash[:param] }
396 )
394 )
397 ["get", "post"].each do |method|
395 assert_routing(
398 assert_routing(
396 { :method => 'get',
399 { :method => method,
397 :path => "/projects/redmine/repository/foo/revision" },
400 :path => "/projects/redmine/repository/foo/revision" },
398 { :controller => 'repositories', :action => 'revision', :id => 'redmine', :repository_id => 'foo'}
401 { :controller => 'repositories', :action => 'revision', :id => 'redmine', :repository_id => 'foo'}
399 )
402 )
403 end
404 end
400 end
405
401
406 def test_repositories_related_issues
402 def test_repositories_related_issues
General Comments 0
You need to be logged in to leave comments. Login now