diff options
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/application/initializer_test.rb | 7 | ||||
-rw-r--r-- | railties/test/initializer_test.rb | 11 |
2 files changed, 7 insertions, 11 deletions
diff --git a/railties/test/application/initializer_test.rb b/railties/test/application/initializer_test.rb index 1b6af718c0..6de07b4122 100644 --- a/railties/test/application/initializer_test.rb +++ b/railties/test/application/initializer_test.rb @@ -54,5 +54,12 @@ module ApplicationTests assert Zoo end + + test "load environment with global" do + app_file "config/environments/development.rb", "$initialize_test_set_from_env = 'success'" + assert_nil $initialize_test_set_from_env + Rails::Initializer.run { } + assert_equal "success", $initialize_test_set_from_env + end end end
\ No newline at end of file diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb index 616374b183..219c65e637 100644 --- a/railties/test/initializer_test.rb +++ b/railties/test/initializer_test.rb @@ -33,17 +33,6 @@ class ConfigurationMock < Rails::Configuration end end -class Initializer_load_environment_Test < Test::Unit::TestCase - def test_load_environment_with_constant - config = ConfigurationMock.new("#{File.dirname(__FILE__)}/fixtures/environment_with_constant.rb") - assert_nil $initialize_test_set_from_env - Rails::Initializer.run(:load_environment, config) - assert_equal "success", $initialize_test_set_from_env - ensure - $initialize_test_set_from_env = nil - end -end - class Initializer_after_initialize_with_blocks_environment_Test < Test::Unit::TestCase def setup config = ConfigurationMock.new("") |