aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/test_case.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2010-02-01 23:42:38 +0000
committerPratik Naik <pratiknaik@gmail.com>2010-02-01 23:42:38 +0000
commitfdcf4d6c5191b25ee3b6c357dafaf17156eb09d3 (patch)
tree347f771202054a443f9df23a8f65f91d49a52209 /railties/lib/rails/generators/test_case.rb
parent27fa38cc3e162b2f8c4bb2d50130fbc17bad6039 (diff)
parent16c0d1d3b6089bb4b0b0baf7c3eeb5949f31f02b (diff)
downloadrails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.tar.gz
rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.tar.bz2
rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.zip
Merge remote branch 'mainstream/master'
Diffstat (limited to 'railties/lib/rails/generators/test_case.rb')
-rw-r--r--railties/lib/rails/generators/test_case.rb7
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.