diff options
| author | José Valim <jose.valim@gmail.com> | 2010-02-01 11:41:16 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-02-01 11:41:16 +0100 |
| commit | 66615f25cf30835968f5c4798c5befea0d357e89 (patch) | |
| tree | e364f1340b605b861c688384914518e4964f8d17 /railties | |
| parent | 0dece7929cf5b04f008640936fb3ece24ce80daa (diff) | |
| parent | e5ab4b0d07ade8d89d633ca744c0eafbc53ee921 (diff) | |
| download | rails-66615f25cf30835968f5c4798c5befea0d357e89.tar.gz rails-66615f25cf30835968f5c4798c5befea0d357e89.tar.bz2 rails-66615f25cf30835968f5c4798c5befea0d357e89.zip | |
Merge branch 'master' of gitproxy:rails/rails
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/test_case.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/test_case.rb b/railties/lib/rails/generators/test_case.rb index 38a3cbb035..6b97c69d8d 100644 --- a/railties/lib/rails/generators/test_case.rb +++ b/railties/lib/rails/generators/test_case.rb @@ -1,4 +1,5 @@ -require 'active_support/core_ext/class/inheritable_attributes' +require 'active_support/core_ext/class/attribute' +require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/hash/reverse_merge' require 'rails/generators' require 'fileutils' @@ -28,8 +29,8 @@ module Rails class TestCase < ActiveSupport::TestCase include FileUtils - extlib_inheritable_accessor :destination_root, :current_path, :generator_class, - :default_arguments, :instance_writer => false + class_attribute :destination_root, :current_path, :generator_class, :default_arguments + delegate :destination_root, :current_path, :generator_class, :default_arguments, :to => :'self.class' # Generators frequently change the current path using +FileUtils.cd+. # So we need to store the path at file load and revert back to it after each test. |