diff options
author | José Valim <jose.valim@gmail.com> | 2009-10-16 01:08:18 -0300 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-10-16 01:08:18 -0300 |
commit | 9ba83cce0318fa5051764f4a16c286adf30169e2 (patch) | |
tree | b1158e6916d69687c1b3e003aa97534a9135f460 /railties/test/initializer | |
parent | 8b340ab2f62bac2af9d5917e296bb4101530282a (diff) | |
parent | ef70ad5538c4ce02c4d31ef01a8db6b55c837571 (diff) | |
download | rails-9ba83cce0318fa5051764f4a16c286adf30169e2.tar.gz rails-9ba83cce0318fa5051764f4a16c286adf30169e2.tar.bz2 rails-9ba83cce0318fa5051764f4a16c286adf30169e2.zip |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/test/initializer')
-rw-r--r-- | railties/test/initializer/check_ruby_version_test.rb | 2 | ||||
-rw-r--r-- | railties/test/initializer/initialize_i18n_test.rb | 2 | ||||
-rw-r--r-- | railties/test/initializer/path_test.rb | 1 |
3 files changed, 5 insertions, 0 deletions
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 |