From eaef1ee09c4bd2ed11722660fddf9b4e7e1384cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 25 Jun 2009 10:44:46 +0200
Subject: Make tests pass again after merge.

---
 railties/test/boot_test.rb                                           | 2 +-
 railties/test/generators/generators_test_helper.rb                   | 4 ++++
 railties/test/rails_generator/rails_controller_generator_test.rb     | 2 +-
 railties/test/rails_generator/rails_mailer_generator_test.rb         | 2 +-
 railties/test/rails_generator/rails_model_generator_test.rb          | 2 +-
 railties/test/rails_generator/rails_model_subclass_generator_test.rb | 4 ++--
 railties/test/rails_generator/rails_resource_generator_test.rb       | 2 +-
 railties/test/rails_generator/rails_scaffold_generator_test.rb       | 2 +-
 8 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/boot_test.rb b/railties/test/boot_test.rb
index 02c7b461f7..7bf420d4f2 100644
--- a/railties/test/boot_test.rb
+++ b/railties/test/boot_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 require 'initializer'
-require "#{File.dirname(__FILE__)}/../lib/generator/templates/app/config/boot"
+require "#{File.dirname(__FILE__)}/../lib/generators/rails/app/templates/config/boot"
 require 'rails/gem_dependency'
 
 class BootTest < Test::Unit::TestCase
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index 9f9b48264b..9462fc2214 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -16,6 +16,10 @@ class GeneratorsTestCase < Test::Unit::TestCase
     rm_rf(destination_root)
   end
 
+  def teardown
+    rm_rf(destination_root)
+  end
+
   def test_truth
     # don't complain, test/unit
   end
diff --git a/railties/test/rails_generator/rails_controller_generator_test.rb b/railties/test/rails_generator/rails_controller_generator_test.rb
index 43fbe972e2..6cbb6bf2bd 100644
--- a/railties/test/rails_generator/rails_controller_generator_test.rb
+++ b/railties/test/rails_generator/rails_controller_generator_test.rb
@@ -1,4 +1,4 @@
-require 'generators/generator_test_helper'
+require 'rails_generator/generator_test_helper'
 
 module Admin
 end
diff --git a/railties/test/rails_generator/rails_mailer_generator_test.rb b/railties/test/rails_generator/rails_mailer_generator_test.rb
index de61e6736d..f580fe27ab 100644
--- a/railties/test/rails_generator/rails_mailer_generator_test.rb
+++ b/railties/test/rails_generator/rails_mailer_generator_test.rb
@@ -1,4 +1,4 @@
-require 'generators/generator_test_helper'
+require 'rails_generator/generator_test_helper'
 
 class RailsMailerGeneratorTest < GeneratorTestCase
 
diff --git a/railties/test/rails_generator/rails_model_generator_test.rb b/railties/test/rails_generator/rails_model_generator_test.rb
index aea2abafba..ae3c2e316e 100644
--- a/railties/test/rails_generator/rails_model_generator_test.rb
+++ b/railties/test/rails_generator/rails_model_generator_test.rb
@@ -1,4 +1,4 @@
-require 'generators/generator_test_helper'
+require 'rails_generator/generator_test_helper'
 
 class RailsModelGeneratorTest < GeneratorTestCase
 
diff --git a/railties/test/rails_generator/rails_model_subclass_generator_test.rb b/railties/test/rails_generator/rails_model_subclass_generator_test.rb
index 30066b5a3c..4f20de6eba 100644
--- a/railties/test/rails_generator/rails_model_subclass_generator_test.rb
+++ b/railties/test/rails_generator/rails_model_subclass_generator_test.rb
@@ -1,4 +1,4 @@
-require 'generators/generator_test_helper'
+require 'rails_generator/generator_test_helper'
 
 class RailsModelSubclassGeneratorTest < GeneratorTestCase
 
@@ -12,4 +12,4 @@ class RailsModelSubclassGeneratorTest < GeneratorTestCase
   def test_model_subclass_must_have_a_parent_class_name
     assert_raise(Rails::Generator::UsageError) { run_generator('model_subclass', %w(Car)) }
   end
-end
\ No newline at end of file
+end
diff --git a/railties/test/rails_generator/rails_resource_generator_test.rb b/railties/test/rails_generator/rails_resource_generator_test.rb
index 1f5bd0ef1e..b9a432cbff 100644
--- a/railties/test/rails_generator/rails_resource_generator_test.rb
+++ b/railties/test/rails_generator/rails_resource_generator_test.rb
@@ -1,4 +1,4 @@
-require 'generators/generator_test_helper'
+require 'rails_generator/generator_test_helper'
 
 class RailsResourceGeneratorTest < GeneratorTestCase
   def test_resource_generates_resources
diff --git a/railties/test/rails_generator/rails_scaffold_generator_test.rb b/railties/test/rails_generator/rails_scaffold_generator_test.rb
index 70829a77fd..ffbeff79fb 100644
--- a/railties/test/rails_generator/rails_scaffold_generator_test.rb
+++ b/railties/test/rails_generator/rails_scaffold_generator_test.rb
@@ -1,4 +1,4 @@
-require 'generators/generator_test_helper'
+require 'rails_generator/generator_test_helper'
 require 'abstract_unit'
 
 class RailsScaffoldGeneratorTest < GeneratorTestCase
-- 
cgit v1.2.3