Ensure changes to I18n locale get reset during tests

actionpack/test/dispatch/show_exceptions_test.rb

@@ -70,8 +70,7 @@ class ShowExceptionsTest < ActionController::IntegrationTest
 
   test "localize public rescue message" do
     # Change locale
-    old_locale = I18n.locale
-    I18n.locale = :da
+    old_locale, I18n.locale = I18n.locale, :da
 
     begin
       @integration_session = open_session(ProductionApp)

actionpack/test/new_base/render_rjs_test.rb

@@ -1,9 +1,7 @@
 require 'abstract_unit'
 
 module RenderRjs
-
   class BasicController < ActionController::Base
-
     self.view_paths = [ActionView::FixtureResolver.new(
       "render_rjs/basic/index.js.rjs"          => "page[:customer].replace_html render(:partial => 'customer')",
       "render_rjs/basic/index_html.js.rjs"     => "page[:customer].replace_html :partial => 'customer'",
@@ -26,6 +24,14 @@ module RenderRjs
   class TestBasic < SimpleRouteCase
     testing BasicController
 
+    def setup
+      @old_locale = I18n.locale
+    end
+
+    def teardown
+      I18n.locale = @old_locale
+    end
+
     test "rendering a partial in an RJS template should pick the JS template over the HTML one" do
       get :index, "format" => "js"
       assert_response("$(\"customer\").update(\"JS Partial\");")
@@ -40,6 +46,5 @@ module RenderRjs
       get :index_locale, "format" => "js"
       assert_response("$(\"customer\").update(\"Danish HTML Partial\");")
     end
-
   end
 end

actionpack/test/template/render_test.rb

@@ -33,18 +33,14 @@ module RenderTestCases
   end
 
   def test_render_file_with_localization
-    begin
-      old_locale = I18n.locale
-      I18n.locale = :da
-      assert_equal "Hey verden", @view.render(:file => "test/hello_world")
-    ensure
-      I18n.locale = old_locale
-    end
+    old_locale, I18n.locale = I18n.locale, :da
+    assert_equal "Hey verden", @view.render(:file => "test/hello_world")
+  ensure
+    I18n.locale = old_locale
   end
 
   def test_render_file_with_dashed_locale
-    old_locale = I18n.locale
-    I18n.locale = :"pt-BR"
+    old_locale, I18n.locale = I18n.locale, :"pt-BR"
     assert_equal "Ola mundo", @view.render(:file => "test/hello_world")
   ensure
     I18n.locale = old_locale