1 files changed, 15 insertions, 16 deletions
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index 8af92479c3..54734ed260 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -1,8 +1,11 @@
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/app/app_generator'
+require 'env_helpers'
 
 class ActionsTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
+  include EnvHelpers
+
   tests Rails::Generators::AppGenerator
   arguments [destination_root]
 
@@ -154,10 +157,9 @@ class ActionsTest < Rails::Generators::TestCase
 
   def test_rake_should_run_rake_command_with_default_env
     generator.expects(:run).once.with("rake log:clear RAILS_ENV=development", verbose: false)
-    old_env, ENV['RAILS_ENV'] = ENV["RAILS_ENV"], nil
-    action :rake, 'log:clear'
-  ensure
-    ENV["RAILS_ENV"] = old_env
+    with_rails_env nil do
+      action :rake, 'log:clear'
+    end
   end
 
   def test_rake_with_env_option_should_run_rake_command_in_env
@@ -167,26 +169,23 @@ class ActionsTest < Rails::Generators::TestCase
 
   def test_rake_with_rails_env_variable_should_run_rake_command_in_env
     generator.expects(:run).once.with('rake log:clear RAILS_ENV=production', verbose: false)
-    old_env, ENV["RAILS_ENV"] = ENV["RAILS_ENV"], "production"
-    action :rake, 'log:clear'
-  ensure
-    ENV["RAILS_ENV"] = old_env
+    with_rails_env "production" do
+      action :rake, 'log:clear'
+    end
   end
 
   def test_env_option_should_win_over_rails_env_variable_when_running_rake
     generator.expects(:run).once.with('rake log:clear RAILS_ENV=production', verbose: false)
-    old_env, ENV["RAILS_ENV"] = ENV["RAILS_ENV"], "staging"
-    action :rake, 'log:clear', env: 'production'
-  ensure
-    ENV["RAILS_ENV"] = old_env
+    with_rails_env "staging" do
+      action :rake, 'log:clear', env: 'production'
+    end
   end
 
   def test_rake_with_sudo_option_should_run_rake_command_with_sudo
     generator.expects(:run).once.with("sudo rake log:clear RAILS_ENV=development", verbose: false)
-    old_env, ENV['RAILS_ENV'] = ENV["RAILS_ENV"], nil
-    action :rake, 'log:clear', sudo: true
-  ensure
-    ENV["RAILS_ENV"] = old_env
+    with_rails_env nil do
+      action :rake, 'log:clear', sudo: true
+    end
   end
 
   def test_capify_should_run_the_capify_command