Use RAILS_ISOLATED_ENGINE and fix namespaced generators tests

4 files changed, 3 insertions, 12 deletions

diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 8b38081667..1c3f8a701a 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -10,7 +10,6 @@ require 'active_support/core_ext/logger'
 require 'action_controller'
 require 'rails/all'
 
-# TODO: Remove these hacks
 module TestApp
   class Application < Rails::Application
     config.root = File.dirname(__FILE__)
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index 17cbac0912..dd1e4bdac1 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -7,15 +7,7 @@ require 'rails/generators/rails/scaffold/scaffold_generator'
 
 class NamespacedGeneratorTestCase < Rails::Generators::TestCase
   def setup
-    TestApp::Application.isolate_namespace(TestApp)
-  end
-
-  def teardown
-    if TestApp.respond_to?(:_railtie)
-      TestApp.singleton_class.send(:undef_method, :_railtie)
-      TestApp.singleton_class.send(:undef_method, :table_name_prefix)
-      TestApp::Application.isolated = false
-    end
+    Rails::Generators.namespace = TestApp
   end
 end
 
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index a13da12ae1..53d3f288d9 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -280,4 +280,4 @@ Module.new do
     end
     f.puts "require 'rails/all'"
   end
-end unless RAILS_ISOLATION_COMMAND=="engine"
+end unless defined?(RAILS_ISOLATED_ENGINE)
diff --git a/railties/test/railties/generators_test.rb b/railties/test/railties/generators_test.rb
index 963518880d..fe59dcd52b 100644
--- a/railties/test/railties/generators_test.rb
+++ b/railties/test/railties/generators_test.rb
@@ -1,4 +1,4 @@
-RAILS_ISOLATION_COMMAND = "engine"
+RAILS_ISOLATED_ENGINE = true
 require "isolation/abstract_unit"
 
 require "#{RAILS_FRAMEWORK_ROOT}/railties/lib/rails/generators/test_case"