diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-11-02 17:12:01 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-11-02 17:12:01 -0800 |
| commit | 14370e1aab6ddfb5b86cf50bd7e5abcebae0684c (patch) | |
| tree | 431146dfb0b15c4507fd49bb7d6f18bd40ccf839 /railties/test/generators/generators_test_helper.rb | |
| parent | 976c2647240fd40a2b706ab5e41856cd47e7b212 (diff) | |
| download | rails-14370e1aab6ddfb5b86cf50bd7e5abcebae0684c.tar.gz rails-14370e1aab6ddfb5b86cf50bd7e5abcebae0684c.tar.bz2 rails-14370e1aab6ddfb5b86cf50bd7e5abcebae0684c.zip | |
CI breakage
This reverts commit a288b74f1c75c6f100de7611a5093a421f1ad6d1.
Diffstat (limited to 'railties/test/generators/generators_test_helper.rb')
| -rw-r--r-- | railties/test/generators/generators_test_helper.rb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb index 829a38c103..ccf08c347c 100644 --- a/railties/test/generators/generators_test_helper.rb +++ b/railties/test/generators/generators_test_helper.rb @@ -1,5 +1,5 @@ # TODO: Fix this RAILS_ENV stuff -RAILS_ENV = 'test' unless defined?(RAILS_ENV) +RAILS_ENV = 'test' require 'abstract_unit' Rails.application.config.root = File.expand_path(File.join(File.dirname(__FILE__), '..', 'fixtures')) @@ -11,17 +11,12 @@ require 'action_dispatch' CURRENT_PATH = File.expand_path(Dir.pwd) Rails::Generators.no_color! -module Rails - def self.root - @root ||= File.expand_path(File.join(File.dirname(__FILE__), '..', 'fixtures', 'tmp')) - end -end - class GeneratorsTestCase < Test::Unit::TestCase include FileUtils def destination_root - Rails.root + @destination_root ||= File.expand_path(File.join(File.dirname(__FILE__), + '..', 'fixtures', 'tmp')) end def setup |