aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-10-10 14:57:19 +0200
committerJosé Valim <jose.valim@gmail.com>2010-10-10 14:57:19 +0200
commit621df2a1ec01b77f7b052b3571f3c696f0443fea (patch)
tree089f0b4c7476e6ef9aa6b5c40bb399b08d398cea /railties/test/generators
parent49b6f33f99a28d68f18203a696fb47854a9085d2 (diff)
parenta9bf91ea5640ab9ed9d6d7ba9da780ea1dfbd6e3 (diff)
downloadrails-621df2a1ec01b77f7b052b3571f3c696f0443fea.tar.gz
rails-621df2a1ec01b77f7b052b3571f3c696f0443fea.tar.bz2
rails-621df2a1ec01b77f7b052b3571f3c696f0443fea.zip
Merge remote branch 'drogus/engines'
Diffstat (limited to 'railties/test/generators')
-rw-r--r--railties/test/generators/namespaced_generators_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index 38b95a49ac..d1190fd17d 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -6,14 +6,14 @@ require 'rails/generators/mailer/mailer_generator'
class NamespacedGeneratorTestCase < Rails::Generators::TestCase
def setup
- TestApp::Application.namespace(TestApp)
+ 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.namespaced = false
+ TestApp::Application.isolated = false
end
end
end