Merge pull request #1497 from arunagw/framework_test

framework_test.rb also dependent on RAILS_ENV=development

2 files changed, 12 insertions, 0 deletions

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