diff test/functional/settings_controller_test.rb @ 511:107d36338b70 live

Merge from branch "cannam"

--- a/test/functional/settings_controller_test.rb	Thu Jun 09 16:51:06 2011 +0100
+++ b/test/functional/settings_controller_test.rb	Thu Jul 14 10:43:07 2011 +0100
@@ -1,21 +1,21 @@
-# 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.
 
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 require 'settings_controller'
 
 # Re-raise errors caught by the controller.
@@ -23,7 +23,7 @@
 
 class SettingsControllerTest < ActionController::TestCase
   fixtures :users
-  
+
   def setup
     @controller = SettingsController.new
     @request    = ActionController::TestRequest.new
@@ -31,19 +31,19 @@
     User.current = nil
     @request.session[:user_id] = 1 # admin
   end
-  
+
   def test_index
     get :index
     assert_response :success
     assert_template 'edit'
   end
-  
+
   def test_get_edit
     get :edit
     assert_response :success
     assert_template 'edit'
   end
-  
+
   def test_post_edit_notifications
     post :edit, :settings => {:mail_from => '[e-mail]',
                               :bcc_recipients  => '0',