Make tests pass again after merge.

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

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

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

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
 

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
 

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
+end

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

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