From 710dfff120da55185086f6068efc1350de9dda5c Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Sun, 5 Jun 2011 23:40:30 +0530 Subject: [PATCH 1/3] framework_test.rb also dependent on RAILS_ENV=development --- railties/test/application/initializers/frameworks_test.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb index 196d121c14..9068bf4b1e 100644 --- a/railties/test/application/initializers/frameworks_test.rb +++ b/railties/test/application/initializers/frameworks_test.rb @@ -5,11 +5,17 @@ module ApplicationTests include ActiveSupport::Testing::Isolation def setup + @prev_rails_env = ENV['RAILS_ENV'] + ENV['RAILS_ENV'] = 'development' build_app boot_rails FileUtils.rm_rf "#{app_path}/config/environments" end + def teardown + ENV['RAILS_ENV'] = @prev_rails_env + end + # AC & AM test "set load paths set only if action controller or action mailer are in use" do assert_nothing_raised NameError do From 077ffe0287e47f299f2627577a7d555220b81d09 Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Mon, 6 Jun 2011 00:55:24 +0530 Subject: [PATCH 2/3] loading_test.rb with RAILS_ENV=development --- railties/test/application/loading_test.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/railties/test/application/loading_test.rb b/railties/test/application/loading_test.rb index c340465e87..5e7e16733e 100644 --- a/railties/test/application/loading_test.rb +++ b/railties/test/application/loading_test.rb @@ -4,10 +4,16 @@ class LoadingTest < Test::Unit::TestCase include ActiveSupport::Testing::Isolation def setup + @prev_rails_env = ENV['RAILS_ENV'] + ENV['RAILS_ENV'] = 'development' build_app boot_rails end + def teardown + ENV['RAILS_ENV'] = @prev_rails_env + end + def app @app ||= Rails.application end From e909fa411277550e6180752ed443ba39efc6d148 Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Mon, 6 Jun 2011 16:13:22 +0530 Subject: [PATCH 3/3] Fix for CI server. Dependent on RAILS_ENV=development --- railties/test/application/console_test.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb index db8f1f2ac6..91e2c2480e 100644 --- a/railties/test/application/console_test.rb +++ b/railties/test/application/console_test.rb @@ -4,10 +4,16 @@ class ConsoleTest < Test::Unit::TestCase include ActiveSupport::Testing::Isolation def setup + @prev_rails_env = ENV['RAILS_ENV'] + ENV['RAILS_ENV'] = 'development' build_app boot_rails end + def teardown + ENV['RAILS_ENV'] = @prev_rails_env + end + def load_environment(sandbox = false) require "#{rails_root}/config/environment" Rails.application.sandbox = sandbox