replace RAILS_ROOT to Rails.root at test/test_helper.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6123 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
f2629db043
commit
ee527ab47c
|
@ -5,12 +5,12 @@
|
||||||
# modify it under the terms of the GNU General Public License
|
# modify it under the terms of the GNU General Public License
|
||||||
# as published by the Free Software Foundation; either version 2
|
# as published by the Free Software Foundation; either version 2
|
||||||
# of the License, or (at your option) any later version.
|
# of the License, or (at your option) any later version.
|
||||||
#
|
#
|
||||||
# This program is distributed in the hope that it will be useful,
|
# This program is distributed in the hope that it will be useful,
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
@ -19,7 +19,7 @@ ENV["RAILS_ENV"] = "test"
|
||||||
require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
|
require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
|
||||||
require 'test_help'
|
require 'test_help'
|
||||||
require File.expand_path(File.dirname(__FILE__) + '/helper_testcase')
|
require File.expand_path(File.dirname(__FILE__) + '/helper_testcase')
|
||||||
require File.join(RAILS_ROOT,'test', 'mocks', 'open_id_authentication_mock.rb')
|
require Rails.root.join('test', 'mocks', 'open_id_authentication_mock.rb')
|
||||||
|
|
||||||
require File.expand_path(File.dirname(__FILE__) + '/object_daddy_helpers')
|
require File.expand_path(File.dirname(__FILE__) + '/object_daddy_helpers')
|
||||||
include ObjectDaddyHelpers
|
include ObjectDaddyHelpers
|
||||||
|
|
Loading…
Reference in New Issue