diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-07 08:09:38 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-07 08:09:38 +0000 |
commit | 6c434e8b8e420c76f86ba6605e98426fddca5031 (patch) | |
tree | 3f5a5f83f41a3e30e37f6b1b03106d000f84d871 /railties/test/initializer_test.rb | |
parent | 5c1eb899dea9aad18220b6403d3dd83863591f28 (diff) | |
download | rails-6c434e8b8e420c76f86ba6605e98426fddca5031.tar.gz rails-6c434e8b8e420c76f86ba6605e98426fddca5031.tar.bz2 rails-6c434e8b8e420c76f86ba6605e98426fddca5031.zip |
New configuration option config.plugin_paths which may be a single path like the default 'vendor/plugins' or an array of paths: ['vendor/plugins', 'lib/plugins']. Plugins are discovered in nested paths, so you can organize your plugins directory as you like. Refactor load_plugin from load_plugins. Simplify initializer unit test. Closes #2757.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2904 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/test/initializer_test.rb')
-rw-r--r-- | railties/test/initializer_test.rb | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb index 4c25ad8a0a..86f7569c50 100644 --- a/railties/test/initializer_test.rb +++ b/railties/test/initializer_test.rb @@ -15,22 +15,19 @@ class InitializerTest < Test::Unit::TestCase def environment_path @envpath end - end - def setup - Object.const_set(:RAILS_ROOT, "") rescue nil - end - - def teardown - Object.remove_const(:RAILS_ROOT) rescue nil + protected + def root_path + File.dirname(__FILE__) + end end - + 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 Object.const_defined?(:SET_FROM_ENV) - assert_equal "success", SET_FROM_ENV + assert_equal "success", $initialize_test_set_from_env ensure - Object.remove_const(:SET_FROM_ENV) rescue nil + $initialize_test_set_from_env = nil end -end
\ No newline at end of file +end |