From 71234daef1517cf190adfc5978e56882d2a57ea6 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 8 Jul 2006 18:14:49 +0000
Subject:  r4487@asus:  jeremy | 2006-04-29 12:21:39 -0700  Check whether
 @flash is defined? for warnings-safety.  r4488@asus:  jeremy | 2006-04-29
 12:23:15 -0700  Check whether @flash is defined? for warnings-safety.
 Obviates nil? check.  r4489@asus:  jeremy | 2006-04-29 12:45:18 -0700  Check
 whether @session is defined? for warnings-safety.  r4490@asus:  jeremy |
 2006-04-29 12:50:41 -0700  Check whether @rendering_runtime is defined? for
 warnings-safety.  r4491@asus:  jeremy | 2006-04-29 12:55:01 -0700  Check
 whether @_cycles is defined? for warnings-safety.  r4492@asus:  jeremy |
 2006-04-29 12:59:19 -0700  Check whether instance variables are defined? for
 warnings-safety.  r4493@asus:  jeremy | 2006-04-29 13:14:09 -0700  Add nil
 @template to PrototypeHelperTest to suppress unitialized instance variable
 warning.  r4494@asus:  jeremy | 2006-04-29 13:31:34 -0700  Check whether
 @auto_index defined? for warnings-safety.  r4495@asus:  jeremy | 2006-04-29
 13:32:24 -0700  Wrap content_columns redefinitions with silence_warnings. 
 r4496@asus:  jeremy | 2006-04-29 13:35:28 -0700  Wrap more redefinitions with
 silence_warnings.  r4829@asus:  jeremy | 2006-07-08 10:59:20 -0700  abstract
 unit, fix warnings  r4830@asus:  jeremy | 2006-07-08 11:06:12 -0700  Use
 parens to silence warning.  r4831@asus:  jeremy | 2006-07-08 11:06:48 -0700 
 Use parens to silence warning.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4595 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activesupport/test/dependencies_test.rb | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'activesupport/test/dependencies_test.rb')

diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index f5651eddcc..397548973a 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -1,13 +1,11 @@
-require 'test/unit'
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib/active_support/'
-require 'core_ext/string'
-require 'dependencies'
+require File.dirname(__FILE__) + '/abstract_unit'
+#require 'dependencies'
 
 class DependenciesTest < Test::Unit::TestCase
   def teardown
     Dependencies.clear
   end
-  
+
   def with_loading(from_dir = nil)
     prior_path = $LOAD_PATH.clone
     $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/#{from_dir}" if from_dir
@@ -103,11 +101,11 @@ class DependenciesTest < Test::Unit::TestCase
       assert_equal 2, $mutual_dependencies_count
     end
   end
-  
+
   def test_as_load_path
     assert_equal '', DependenciesTest.as_load_path
   end
-  
+
   def test_module_loading
     with_loading 'autoloading_fixtures' do
       assert_kind_of Module, A
@@ -116,7 +114,7 @@ class DependenciesTest < Test::Unit::TestCase
       assert_kind_of Class, A::C::E::F
     end
   end
-  
+
   def test_non_existing_const_raises_name_error
     with_loading 'autoloading_fixtures' do
       assert_raises(NameError) { DoesNotExist }
@@ -125,21 +123,21 @@ class DependenciesTest < Test::Unit::TestCase
       assert_raises(NameError) { A::B::DoesNotExist }
     end
   end
-  
+
   def test_directories_should_manifest_as_modules
     with_loading 'autoloading_fixtures' do
       assert_kind_of Module, ModuleFolder
       Object.send :remove_const, :ModuleFolder
     end
   end
-  
+
   def test_nested_class_access
     with_loading 'autoloading_fixtures' do
       assert_kind_of Class, ModuleFolder::NestedClass
       Object.send :remove_const, :ModuleFolder
     end
   end
-  
+
   def test_nested_class_can_access_sibling
     with_loading 'autoloading_fixtures' do
       sibling = ModuleFolder::NestedClass.class_eval "NestedSibling"
@@ -148,7 +146,7 @@ class DependenciesTest < Test::Unit::TestCase
       Object.send :remove_const, :ModuleFolder
     end
   end
-  
+
   def failing_test_access_thru_and_upwards_fails
     with_loading 'autoloading_fixtures' do
       assert ! defined?(ModuleFolder)
@@ -157,5 +155,4 @@ class DependenciesTest < Test::Unit::TestCase
       Object.send :remove_const, :ModuleFolder
     end
   end
-  
 end
-- 
cgit v1.2.3