From 2601a16ede92566c651c06942294250ea653bd85 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 4 Jan 2010 16:22:39 -0600
Subject: Autoload AS test case

---
 railties/lib/rails/console_app.rb                                | 1 -
 railties/lib/rails/generators/test_case.rb                       | 9 ++++-----
 .../rails/generators/test_unit/plugin/templates/test_helper.rb   | 2 --
 railties/test/abstract_unit.rb                                   | 1 -
 4 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/console_app.rb b/railties/lib/rails/console_app.rb
index 2c4a7a51e8..902a621272 100644
--- a/railties/lib/rails/console_app.rb
+++ b/railties/lib/rails/console_app.rb
@@ -1,5 +1,4 @@
 require 'active_support/all'
-require 'active_support/test_case'
 require 'action_controller'
 
 # work around the at_exit hook in test/unit, which kills IRB
diff --git a/railties/lib/rails/generators/test_case.rb b/railties/lib/rails/generators/test_case.rb
index 643d7856c5..38a3cbb035 100644
--- a/railties/lib/rails/generators/test_case.rb
+++ b/railties/lib/rails/generators/test_case.rb
@@ -1,4 +1,3 @@
-require 'active_support/test_case'
 require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/hash/reverse_merge'
 require 'rails/generators'
@@ -76,7 +75,7 @@ module Rails
           eval "$#{stream} = StringIO.new"
           yield
           result = eval("$#{stream}").string
-        ensure 
+        ensure
           eval("$#{stream} = #{stream.upcase}")
         end
 
@@ -137,9 +136,9 @@ module Rails
       #
       #   assert_migration "db/migrate/create_products.rb"
       #
-      # This method manipulates the given path and tries to find any migration which 
+      # This method manipulates the given path and tries to find any migration which
       # matches the migration name. For example, the call above is converted to:
-      # 
+      #
       #   assert_file "db/migrate/003_create_products.rb"
       #
       # Consequently, assert_migration accepts the same arguments has assert_file.
@@ -236,4 +235,4 @@ module Rails
         end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb b/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb
index 348ec33582..2ca36a1e44 100644
--- a/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb
+++ b/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb
@@ -1,5 +1,3 @@
 require 'rubygems'
 require 'test/unit'
 require 'active_support'
-require 'active_support/test_case'
-
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 2d6983076a..77ef82856a 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -17,7 +17,6 @@ require 'fileutils'
 
 require 'active_support'
 require 'active_support/core_ext/logger'
-require 'active_support/test_case'
 
 require 'action_controller'
 require 'rails/all'
-- 
cgit v1.2.3