routes for issue copy and moving

controller test fixes

returned URLs not URL-encoded anymore
pull/1186/head
Dennis Schmidt 12 years ago
parent 2eac7ffb6b
commit 693c939f6e
  1. 15
      config/routes.rb
  2. 34
      test/functional/context_menus_controller_test.rb

@ -121,6 +121,10 @@ OpenProject::Application.routes.draw do
}
resources :issues do
# should probably belong to :member, but requires :copy_from instead
# of the default :id
get ':copy_from/copy', :action => "new", :on => :collection, :as => "copy"
collection do
get :all
get :bulk_edit
@ -137,7 +141,11 @@ OpenProject::Application.routes.draw do
end
resources :issue_moves, :only => [:new, :create], :path_prefix => '/issues', :as => 'issue_move'
# TODO: nest under issues resources
scope 'issues' do
match '/move' => "issue_moves#create", :via => :post
match '/move/new' => "issue_moves#new", :via => :get, :as => "new_issue_move"
end
# Misc issue routes. TODO: move into resources
match '/issues/auto_complete' => 'autoCompletes#issues', :as => 'auto_complete_issues'
@ -207,11 +215,6 @@ OpenProject::Application.routes.draw do
# Destroy uses a get request to prompt the user before the actual DELETE request
match '/projects/:id/destroy' => 'project#destroy', :via => :get, :as => 'project_destroy_confirm'
# TODO: port to be part of the resources route(s)
scope :via => :get do
match '/projects/:project_id/issues/:copy_from/copy' => 'issues#new'
end
scope :controller => 'activities', :action => 'index', :via => :get do
match '/projects/:id/activity(.:format)'
match '/activity(.:format)'

@ -26,31 +26,31 @@ class ContextMenusControllerTest < ActionController::TestCase
:attributes => { :href => '/issues/1/edit',
:class => 'icon-edit' }
assert_tag :tag => 'a', :content => 'Closed',
:attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;issue%5Bstatus_id%5D=5',
:attributes => { :href => '/issues/bulk_edit?ids[]=1&amp;issue[status_id]=5',
:class => '' }
assert_tag :tag => 'a', :content => 'Immediate',
:attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;issue%5Bpriority_id%5D=8',
:attributes => { :href => '/issues/bulk_edit?ids[]=1&amp;issue[priority_id]=8',
:class => '' }
# Versions
assert_tag :tag => 'a', :content => '2.0',
:attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;issue%5Bfixed_version_id%5D=3',
:attributes => { :href => '/issues/bulk_edit?ids[]=1&amp;issue[fixed_version_id]=3',
:class => '' }
assert_tag :tag => 'a', :content => 'eCookbook Subproject 1 - 2.0',
:attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;issue%5Bfixed_version_id%5D=4',
:attributes => { :href => '/issues/bulk_edit?ids[]=1&amp;issue[fixed_version_id]=4',
:class => '' }
assert_tag :tag => 'a', :content => 'Dave Lopper',
:attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;issue%5Bassigned_to_id%5D=3',
:attributes => { :href => '/issues/bulk_edit?ids[]=1&amp;issue[assigned_to_id]=3',
:class => '' }
assert_tag :tag => 'a', :content => 'Duplicate',
:attributes => { :href => '/projects/ecookbook/issues/1/copy',
:class => 'icon-duplicate' }
assert_tag :tag => 'a', :content => 'Copy',
:attributes => { :href => '/issues/move/new?copy_options%5Bcopy%5D=t&amp;ids%5B%5D=1' }
:attributes => { :href => '/issues/move/new?copy_options[copy]=t&amp;ids[]=1' }
assert_tag :tag => 'a', :content => 'Move',
:attributes => { :href => '/issues/move/new?ids%5B%5D=1'}
:attributes => { :href => '/issues/move/new?ids[]=1'}
assert_tag :tag => 'a', :content => 'Delete',
:attributes => { :href => '/issues/destroy?ids%5B%5D=1' }
:attributes => { :href => '/issues/destroy?ids[]=1' }
end
def test_context_menu_one_issue_by_anonymous
@ -68,21 +68,21 @@ class ContextMenusControllerTest < ActionController::TestCase
assert_not_nil assigns(:issues)
assert_equal [1, 2], assigns(:issues).map(&:id).sort
ids = assigns(:issues).map(&:id).map {|i| "ids%5B%5D=#{i}"}.join('&amp;')
ids = assigns(:issues).map(&:id).map {|i| "ids[]=#{i}"}.join('&amp;')
assert_tag :tag => 'a', :content => 'Edit',
:attributes => { :href => "/issues/bulk_edit?#{ids}",
:class => 'icon-edit' }
assert_tag :tag => 'a', :content => 'Closed',
:attributes => { :href => "/issues/bulk_edit?#{ids}&amp;issue%5Bstatus_id%5D=5",
:attributes => { :href => "/issues/bulk_edit?#{ids}&amp;issue[status_id]=5",
:class => '' }
assert_tag :tag => 'a', :content => 'Immediate',
:attributes => { :href => "/issues/bulk_edit?#{ids}&amp;issue%5Bpriority_id%5D=8",
:attributes => { :href => "/issues/bulk_edit?#{ids}&amp;issue[priority_id]=8",
:class => '' }
assert_tag :tag => 'a', :content => 'Dave Lopper',
:attributes => { :href => "/issues/bulk_edit?#{ids}&amp;issue%5Bassigned_to_id%5D=3",
:attributes => { :href => "/issues/bulk_edit?#{ids}&amp;issue[assigned_to_id]=3",
:class => '' }
assert_tag :tag => 'a', :content => 'Copy',
:attributes => { :href => "/issues/move/new?copy_options%5Bcopy%5D=t&amp;#{ids}"}
:attributes => { :href => "/issues/move/new?copy_options[copy]=t&amp;#{ids}"}
assert_tag :tag => 'a', :content => 'Move',
:attributes => { :href => "/issues/move/new?#{ids}"}
assert_tag :tag => 'a', :content => 'Delete',
@ -97,18 +97,18 @@ class ContextMenusControllerTest < ActionController::TestCase
assert_not_nil assigns(:issues)
assert_equal [1, 2, 6], assigns(:issues).map(&:id).sort
ids = assigns(:issues).map(&:id).map {|i| "ids%5B%5D=#{i}"}.join('&amp;')
ids = assigns(:issues).map(&:id).map {|i| "ids[]=#{i}"}.join('&amp;')
assert_tag :tag => 'a', :content => 'Edit',
:attributes => { :href => "/issues/bulk_edit?#{ids}",
:class => 'icon-edit' }
assert_tag :tag => 'a', :content => 'Closed',
:attributes => { :href => "/issues/bulk_edit?#{ids}&amp;issue%5Bstatus_id%5D=5",
:attributes => { :href => "/issues/bulk_edit?#{ids}&amp;issue[status_id]=5",
:class => '' }
assert_tag :tag => 'a', :content => 'Immediate',
:attributes => { :href => "/issues/bulk_edit?#{ids}&amp;issue%5Bpriority_id%5D=8",
:attributes => { :href => "/issues/bulk_edit?#{ids}&amp;issue[priority_id]=8",
:class => '' }
assert_tag :tag => 'a', :content => 'John Smith',
:attributes => { :href => "/issues/bulk_edit?#{ids}&amp;issue%5Bassigned_to_id%5D=2",
:attributes => { :href => "/issues/bulk_edit?#{ids}&amp;issue[assigned_to_id]=2",
:class => '' }
assert_tag :tag => 'a', :content => 'Delete',
:attributes => { :href => "/issues/destroy?#{ids}"}

Loading…
Cancel
Save