From 62570e8626c67f9d38b28246304b938aab9d9fbe Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Mon, 6 Jun 2011 13:54:05 +0100 Subject: Solve the RAILS_ENV problem in the railties tests in a more generic way --- railties/test/isolation/abstract_unit.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'railties/test/isolation') diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 69208ce4c3..c0233c5f90 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -91,6 +91,8 @@ module TestHelpers module Generation # Build an application by invoking the generator and going through the whole stack. def build_app(options = {}) + @prev_rails_env = ENV.delete('RAILS_ENV') + FileUtils.rm_rf(app_path) FileUtils.cp_r(tmp_path('app_template'), app_path) @@ -115,6 +117,10 @@ module TestHelpers add_to_config 'config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"; config.session_store :cookie_store, :key => "_myapp_session"; config.active_support.deprecation = :log' end + def teardown_app + ENV['RAILS_ENV'] = @prev_rails_env if @prev_rails_env + end + # Make a very basic app, without creating the whole directory structure. # This is faster and simpler than the method above. def make_basic_app -- cgit v1.2.3