diff options
| author | Joshua Peek <josh@joshpeek.com> | 2010-01-04 16:22:39 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2010-01-04 16:22:46 -0600 |
| commit | 2601a16ede92566c651c06942294250ea653bd85 (patch) | |
| tree | 807c19a8e983d8055a992ccf6032552f8105c7ff /railties/lib/rails | |
| parent | ce56c36cd392d6ab0505f0dc4df04c3ad2c074f1 (diff) | |
| download | rails-2601a16ede92566c651c06942294250ea653bd85.tar.gz rails-2601a16ede92566c651c06942294250ea653bd85.tar.bz2 rails-2601a16ede92566c651c06942294250ea653bd85.zip | |
Autoload AS test case
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/console_app.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/generators/test_case.rb | 9 | ||||
| -rw-r--r-- | railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb | 2 |
3 files changed, 4 insertions, 8 deletions
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' - |