diff test/functional/documents_controller_test.rb @ 442:753f1380d6bc cannam

Merge from branch "redmine-1.2"

--- a/test/functional/documents_controller_test.rb	Thu Mar 03 15:08:45 2011 +0000
+++ b/test/functional/documents_controller_test.rb	Mon Jun 06 14:41:04 2011 +0100
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
@@ -23,30 +23,30 @@
 
 class DocumentsControllerTest < ActionController::TestCase
   fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :documents, :enumerations
-  
+
   def setup
     @controller = DocumentsController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     User.current = nil
   end
-  
+
   def test_index
     # Sets a default category
     e = Enumeration.find_by_name('Technical documentation')
     e.update_attributes(:is_default => true)
-    
+
     get :index, :project_id => 'ecookbook'
     assert_response :success
     assert_template 'index'
     assert_not_nil assigns(:grouped)
-    
+
     # Default category selected in the new document form
     assert_tag :select, :attributes => {:name => 'document[category_id]'},
                         :child => {:tag => 'option', :attributes => {:selected => 'selected'},
                                                      :content => 'Technical documentation'}
   end
-  
+
   def test_index_with_long_description
     # adds a long description to the first document
     doc = documents(:documents_001)
@@ -55,7 +55,7 @@
 
 Vestibulum non velit mi. Aliquam scelerisque libero ut nulla fringilla a sollicitudin magna rhoncus.  Praesent a nunc lorem, ac porttitor eros. Sed ac diam nec neque interdum adipiscing quis quis justo. Donec arcu nunc, fringilla eu dictum at, venenatis ac sem. Vestibulum quis elit urna, ac mattis sapien. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
 LOREM
-    
+
     get :index, :project_id => 'ecookbook'
     assert_response :success
     assert_template 'index'
@@ -64,21 +64,21 @@
     assert_select '.wiki p', :text => (doc.description.split("\n").first + '...')
     assert_select '.wiki p', :text => Regexp.new(Regexp.escape("EndOfLineHere..."))
   end
-  
+
   def test_new_with_one_attachment
     ActionMailer::Base.deliveries.clear
     Setting.notified_events << 'document_added'
     @request.session[:user_id] = 2
     set_tmp_attachments_directory
-    
+
     post :new, :project_id => 'ecookbook',
                :document => { :title => 'DocumentsControllerTest#test_post_new',
                               :description => 'This is a new document',
                               :category_id => 2},
                :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
-               
+
     assert_redirected_to '/projects/ecookbook/documents'
-    
+
     document = Document.find_by_title('DocumentsControllerTest#test_post_new')
     assert_not_nil document
     assert_equal Enumeration.find(2), document.category
@@ -86,7 +86,7 @@
     assert_equal 'testfile.txt', document.attachments.first.filename
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
-  
+
   def test_destroy
     @request.session[:user_id] = 2
     post :destroy, :id => 1