From 14370e1aab6ddfb5b86cf50bd7e5abcebae0684c Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@gmail.com>
Date: Mon, 2 Nov 2009 17:12:01 -0800
Subject: CI breakage

This reverts commit a288b74f1c75c6f100de7611a5093a421f1ad6d1.
---
 railties/test/generators/generators_test_helper.rb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'railties/test/generators/generators_test_helper.rb')

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
-- 
cgit v1.2.3