Merged r3913 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3963 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/functional/auth_sources_controller_test.rb b/test/functional/auth_sources_controller_test.rb
index bd97844ed2763dae64c055bc5b36c9abd04633f3..348e0e098d8d933ee83f3a7d5fe899760862b106 100644 (file)
--- a/test/functional/auth_sources_controller_test.rb
+++ b/test/functional/auth_sources_controller_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class AuthSourcesControllerTest < ActionController::TestCase
   fixtures :all

diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb
index 79cfe28a04409afa4ca933dcf85b430d939f1dd9..ad047c6690e9879b9bb053fd72cb33037681fe19 100644 (file)
--- a/test/functional/calendars_controller_test.rb
+++ b/test/functional/calendars_controller_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class CalendarsControllerTest < ActionController::TestCase
   fixtures :all

diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb
index 4c27de7cd1ecc4378253521daf196ce5d14d199e..24c84f2aeb7dea98f5b3e09c0fb7e344a644c08a 100644 (file)
--- a/test/functional/gantts_controller_test.rb
+++ b/test/functional/gantts_controller_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class GanttsControllerTest < ActionController::TestCase
   fixtures :all