Merge branch 'master' of git://github.com/rails/rails

3 files changed, 13 insertions, 7 deletions

diff --git a/railties/test/initializer/check_ruby_version_test.rb b/railties/test/initializer/check_ruby_version_test.rb
index 6c32f5635b..cf956e68fb 100644
--- a/railties/test/initializer/check_ruby_version_test.rb
+++ b/railties/test/initializer/check_ruby_version_test.rb
@@ -7,6 +7,7 @@ module InitializerTests
     def setup
       build_app
       boot_rails
+      require "rails"
     end
 
     test "rails does not initialize with ruby version 1.8.1" do
@@ -42,7 +43,7 @@ module InitializerTests
       set_ruby_version(version)
       assert_nothing_raised "It appears that rails does not boot" do
         Rails::Initializer.run { |c| c.frameworks = [] }
-        Rails.application.new
+        Rails.initialize!
       end
     end
 
@@ -51,7 +52,7 @@ module InitializerTests
       $stderr = File.open("/dev/null", "w")
       assert_raises(SystemExit) do
         Rails::Initializer.run { |c| c.frameworks = [] }
-        Rails.application.new
+        Rails.initialize!
       end
     end
   end
diff --git a/railties/test/initializer/initialize_i18n_test.rb b/railties/test/initializer/initialize_i18n_test.rb
index f952d06f94..d664f96ad1 100644
--- a/railties/test/initializer/initialize_i18n_test.rb
+++ b/railties/test/initializer/initialize_i18n_test.rb
@@ -7,14 +7,16 @@ module InitializerTests
     def setup
       build_app
       boot_rails
+      require "rails"
     end
 
     # test_config_defaults_and_settings_should_be_added_to_i18n_defaults
     test "i18n config defaults and settings should be added to i18n defaults" do
       Rails::Initializer.run do |c|
+        c.root = app_path
         c.i18n.load_path << "my/other/locale.yml"
       end
-      Rails.application.new
+      Rails.initialize!
 
       #{RAILS_FRAMEWORK_ROOT}/railties/test/fixtures/plugins/engines/engine/config/locales/en.yml
       assert_equal %W(
@@ -24,7 +26,7 @@ module InitializerTests
         #{RAILS_FRAMEWORK_ROOT}/actionpack/lib/action_view/locale/en.yml
         #{RAILS_FRAMEWORK_ROOT}/railties/tmp/app/config/locales/en.yml
         my/other/locale.yml
-      ), I18n.load_path
+      ).map { |path| File.expand_path(path) }, I18n.load_path.map { |path| File.expand_path(path) }
     end
 
     test "i18n finds locale files in engines" do
@@ -34,9 +36,10 @@ module InitializerTests
       app_file "vendor/plugins/engine/config/locales/en.yml", "hello:"
 
       Rails::Initializer.run do |c|
+        c.root = app_path
         c.i18n.load_path << "my/other/locale.yml"
       end
-      Rails.application.new
+      Rails.initialize!
 
       #{RAILS_FRAMEWORK_ROOT}/railties/test/fixtures/plugins/engines/engine/config/locales/en.yml
       assert_equal %W(
@@ -47,7 +50,7 @@ module InitializerTests
         #{app_path}/config/locales/en.yml
         my/other/locale.yml
         #{app_path}/vendor/plugins/engine/config/locales/en.yml
-      ), I18n.load_path
+      ).map { |path| File.expand_path(path) }, I18n.load_path.map { |path| File.expand_path(path) }
     end
   end
 end
\ No newline at end of file
diff --git a/railties/test/initializer/path_test.rb b/railties/test/initializer/path_test.rb
index ce8fc4b8b0..1b58a58555 100644
--- a/railties/test/initializer/path_test.rb
+++ b/railties/test/initializer/path_test.rb
@@ -6,13 +6,15 @@ class PathsTest < Test::Unit::TestCase
   def setup
     build_app
     boot_rails
+    require "rails"
     Rails::Initializer.run do |config|
+      config.root = app_path
       config.frameworks = [:action_controller, :action_view, :action_mailer, :active_record]
       config.after_initialize do
         ActionController::Base.session_store = nil
       end
     end
-    Rails.application.new
+    Rails.initialize!
     @paths = Rails.application.config.paths
   end