diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 4f09dd45a3..6b9a5ae2ae 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -502,6 +502,8 @@ module Rails else Pathname.new(::RAILS_ROOT).realpath.to_s end + + ::RAILS_ROOT.replace @root_path end # Loads and returns the contents of the #database_configuration_file. The diff --git a/railties/test/fixtures/environment_with_constant.rb b/railties/test/fixtures/environment_with_constant.rb index 1c7120655e..23e1f7afd9 100644 --- a/railties/test/fixtures/environment_with_constant.rb +++ b/railties/test/fixtures/environment_with_constant.rb @@ -1 +1 @@ -$initialize_test_set_from_env = "success" +$initialize_test_set_from_env = 'success' diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb index 86f7569c50..cf333e878e 100644 --- a/railties/test/initializer_test.rb +++ b/railties/test/initializer_test.rb @@ -1,25 +1,14 @@ -$:.unshift File.dirname(__FILE__) + "/../lib" -$:.unshift File.dirname(__FILE__) + "/../../activesupport/lib" - -require 'test/unit' -require 'active_support' +require "#{File.dirname(__FILE__)}/abstract_unit" require 'initializer' class InitializerTest < Test::Unit::TestCase class ConfigurationMock < Rails::Configuration + attr_reader :environment_path + def initialize(envpath) super() - @envpath = envpath + @environment_path = envpath end - - def environment_path - @envpath - end - - protected - def root_path - File.dirname(__FILE__) - end end def test_load_environment_with_constant