comparison test/functional/journals_controller_test.rb @ 442:753f1380d6bc cannam

Merge from branch "redmine-1.2"

 #
 # 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.
 
 require File.expand_path('../../test_helper', __FILE__)

 
 # Re-raise errors caught by the controller.
 class JournalsController; def rescue_action(e) raise e end; end
 
 class JournalsControllerTest < ActionController::TestCase
-  fixtures :projects, :users, :members, :member_roles, :roles, :issues, :journals, :journal_details, :enabled_modules
-  
+  fixtures :projects, :users, :members, :member_roles, :roles, :issues, :journals, :journal_details, :enabled_modules,
+    :trackers, :issue_statuses, :enumerations, :custom_fields, :custom_values, :custom_fields_projects
+
   def setup
     @controller = JournalsController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     User.current = nil
   end
-  
+
   def test_index
     get :index, :project_id => 1
     assert_response :success
     assert_not_nil assigns(:journals)
     assert_equal 'application/atom+xml', @response.content_type
   end
-  
+
   def test_diff
     get :diff, :id => 3, :detail_id => 4
     assert_response :success
     assert_template 'diff'
-    
+
     assert_tag 'span',
       :attributes => {:class => 'diff_out'},
       :content => /removed/
     assert_tag 'span',
       :attributes => {:class => 'diff_in'},
       :content => /added/
   end
-  
+
   def test_reply_to_issue
     @request.session[:user_id] = 2
     get :new, :id => 6
     assert_response :success
     assert_select_rjs :show, "update"
   end
-  
+
   def test_reply_to_issue_without_permission
     @request.session[:user_id] = 7
     get :new, :id => 6
     assert_response 403
   end

     assert_select_rjs :insert, :after, 'journal-2-notes' do
       assert_select 'form[id=journal-2-form]'
       assert_select 'textarea'
     end
   end
-  
+
   def test_post_edit
     @request.session[:user_id] = 1
     xhr :post, :edit, :id => 2, :notes => 'Updated notes'
     assert_response :success
     assert_select_rjs :replace, 'journal-2-notes'
     assert_equal 'Updated notes', Journal.find(2).notes
   end
-  
+
   def test_post_edit_with_empty_notes
     @request.session[:user_id] = 1
     xhr :post, :edit, :id => 2, :notes => ''
     assert_response :success
     assert_select_rjs :remove, 'change-2'