diff test/functional/.svn/text-base/context_menus_controller_test.rb.svn-base @ 120:cd2282d2aa55 cannam

Merge from the default branch.  Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).

--- a/test/functional/.svn/text-base/context_menus_controller_test.rb.svn-base	Thu Jan 13 13:21:03 2011 +0000
+++ b/test/functional/.svn/text-base/context_menus_controller_test.rb.svn-base	Thu Jan 13 14:33:08 2011 +0000
@@ -56,26 +56,30 @@
     get :issues, :ids => [1, 2]
     assert_response :success
     assert_template 'context_menu'
+    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('&')
     assert_tag :tag => 'a', :content => 'Edit',
-                            :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&ids%5B%5D=2',
+                            :attributes => { :href => "/issues/bulk_edit?#{ids}",
                                              :class => 'icon-edit' }
     assert_tag :tag => 'a', :content => 'Closed',
-                            :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&ids%5B%5D=2&issue%5Bstatus_id%5D=5',
+                            :attributes => { :href => "/issues/bulk_edit?#{ids}&issue%5Bstatus_id%5D=5",
                                              :class => '' }
     assert_tag :tag => 'a', :content => 'Immediate',
-                            :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&ids%5B%5D=2&issue%5Bpriority_id%5D=8',
+                            :attributes => { :href => "/issues/bulk_edit?#{ids}&issue%5Bpriority_id%5D=8",
                                              :class => '' }
     assert_tag :tag => 'a', :content => 'Dave Lopper',
-                            :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&ids%5B%5D=2&issue%5Bassigned_to_id%5D=3',
+                            :attributes => { :href => "/issues/bulk_edit?#{ids}&issue%5Bassigned_to_id%5D=3",
                                              :class => '' }
     assert_tag :tag => 'a', :content => 'Copy',
-                            :attributes => { :href => '/issues/move/new?copy_options%5Bcopy%5D=t&ids%5B%5D=1&ids%5B%5D=2',
+                            :attributes => { :href => "/issues/move/new?copy_options%5Bcopy%5D=t&#{ids}",
                                              :class => 'icon-copy' }
     assert_tag :tag => 'a', :content => 'Move',
-                            :attributes => { :href => '/issues/move/new?ids%5B%5D=1&ids%5B%5D=2',
+                            :attributes => { :href => "/issues/move/new?#{ids}",
                                              :class => 'icon-move' }
     assert_tag :tag => 'a', :content => 'Delete',
-                            :attributes => { :href => '/issues/destroy?ids%5B%5D=1&ids%5B%5D=2',
+                            :attributes => { :href => "/issues/destroy?#{ids}",
                                              :class => 'icon-del' }
   end
 
@@ -84,7 +88,10 @@
     get :issues, :ids => [1, 2, 6]
     assert_response :success
     assert_template 'context_menu'
-    ids = "ids%5B%5D=1&ids%5B%5D=2&ids%5B%5D=6"
+    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('&')
     assert_tag :tag => 'a', :content => 'Edit',
                             :attributes => { :href => "/issues/bulk_edit?#{ids}",
                                              :class => 'icon-edit' }