From 6c434e8b8e420c76f86ba6605e98426fddca5031 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 7 Nov 2005 08:09:38 +0000
Subject: 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
---
 railties/test/initializer_test.rb | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'railties/test/initializer_test.rb')

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
-- 
cgit v1.2.3