From 97296b11e2c4011ea5522c4de0153f7ffa6a47ae Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Thu, 15 Oct 2009 14:50:02 -0700
Subject: Have config/application.rb contain the application definition and
 require that file instead of config/boot.rb or config/environment.rb in
 script/*.

---
 railties/test/initializer/check_ruby_version_test.rb | 2 ++
 railties/test/initializer/initialize_i18n_test.rb    | 2 ++
 railties/test/initializer/path_test.rb               | 1 +
 3 files changed, 5 insertions(+)

(limited to 'railties/test/initializer')

diff --git a/railties/test/initializer/check_ruby_version_test.rb b/railties/test/initializer/check_ruby_version_test.rb
index 1852fea4df..6c32f5635b 100644
--- a/railties/test/initializer/check_ruby_version_test.rb
+++ b/railties/test/initializer/check_ruby_version_test.rb
@@ -42,6 +42,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
       end
     end
 
@@ -50,6 +51,7 @@ module InitializerTests
       $stderr = File.open("/dev/null", "w")
       assert_raises(SystemExit) do
         Rails::Initializer.run { |c| c.frameworks = [] }
+        Rails.application.new
       end
     end
   end
diff --git a/railties/test/initializer/initialize_i18n_test.rb b/railties/test/initializer/initialize_i18n_test.rb
index e909688817..f952d06f94 100644
--- a/railties/test/initializer/initialize_i18n_test.rb
+++ b/railties/test/initializer/initialize_i18n_test.rb
@@ -14,6 +14,7 @@ module InitializerTests
       Rails::Initializer.run do |c|
         c.i18n.load_path << "my/other/locale.yml"
       end
+      Rails.application.new
 
       #{RAILS_FRAMEWORK_ROOT}/railties/test/fixtures/plugins/engines/engine/config/locales/en.yml
       assert_equal %W(
@@ -35,6 +36,7 @@ module InitializerTests
       Rails::Initializer.run do |c|
         c.i18n.load_path << "my/other/locale.yml"
       end
+      Rails.application.new
 
       #{RAILS_FRAMEWORK_ROOT}/railties/test/fixtures/plugins/engines/engine/config/locales/en.yml
       assert_equal %W(
diff --git a/railties/test/initializer/path_test.rb b/railties/test/initializer/path_test.rb
index 72ff8d88e0..ce8fc4b8b0 100644
--- a/railties/test/initializer/path_test.rb
+++ b/railties/test/initializer/path_test.rb
@@ -12,6 +12,7 @@ class PathsTest < Test::Unit::TestCase
         ActionController::Base.session_store = nil
       end
     end
+    Rails.application.new
     @paths = Rails.application.config.paths
   end
 
-- 
cgit v1.2.3