2 files changed, 10 insertions, 10 deletions
diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb
index 453c2e75d6..cd89dceb45 100644
--- a/actionview/test/actionpack/controller/render_test.rb
+++ b/actionview/test/actionpack/controller/render_test.rb
@@ -186,12 +186,12 @@ class TestController < ApplicationController
 
   def render_file_with_locals
     path = File.join(File.dirname(__FILE__), "../../fixtures/test/render_file_with_locals")
-    render file: path, locals: {secret: "in the sauce"}
+    render file: path, locals: { secret: "in the sauce" }
   end
 
   def render_file_as_string_with_locals
     path = File.expand_path(File.join(File.dirname(__FILE__), "../../fixtures/test/render_file_with_locals"))
-    render file: path, locals: {secret: "in the sauce"}
+    render file: path, locals: { secret: "in the sauce" }
   end
 
   def accessing_request_in_template
@@ -249,7 +249,7 @@ class TestController < ApplicationController
   end
 
   def render_line_offset
-    render inline: "<% raise %>", locals: {foo: "bar"}
+    render inline: "<% raise %>", locals: { foo: "bar" }
   end
 
   def heading
@@ -593,7 +593,7 @@ class TestController < ApplicationController
   end
 
   def partial_with_hash_object
-    render partial: "hash_object", object: {first_name: "Sam"}
+    render partial: "hash_object", object: { first_name: "Sam" }
   end
 
   def partial_with_nested_object
@@ -605,11 +605,11 @@ class TestController < ApplicationController
   end
 
   def partial_hash_collection
-    render partial: "hash_object", collection: [ {first_name: "Pratik"}, {first_name: "Amy"} ]
+    render partial: "hash_object", collection: [ { first_name: "Pratik" }, { first_name: "Amy" } ]
   end
 
   def partial_hash_collection_with_locals
-    render partial: "hash_greeting", collection: [ {first_name: "Pratik"}, {first_name: "Amy"} ], locals: { greeting: "Hola" }
+    render partial: "hash_greeting", collection: [ { first_name: "Pratik" }, { first_name: "Amy" } ], locals: { greeting: "Hola" }
   end
 
   def partial_with_implicit_local_assignment
diff --git a/actionview/test/actionpack/controller/view_paths_test.rb b/actionview/test/actionpack/controller/view_paths_test.rb
index e676a2ecd4..4c58b959a9 100644
--- a/actionview/test/actionpack/controller/view_paths_test.rb
+++ b/actionview/test/actionpack/controller/view_paths_test.rb
@@ -23,9 +23,9 @@ class ViewLoadPathsTest < ActionController::TestCase
   end
 
   def setup
-    @request  = ActionController::TestRequest.create
-    @response = ActionDispatch::TestResponse.new
     @controller = TestController.new
+    @request  = ActionController::TestRequest.create(@controller.class)
+    @response = ActionDispatch::TestResponse.new
     @paths = TestController.view_paths
   end
 
@@ -34,7 +34,7 @@ class ViewLoadPathsTest < ActionController::TestCase
   end
 
   def expand(array)
-    array.map {|x| File.expand_path(x.to_s)}
+    array.map { |x| File.expand_path(x.to_s) }
   end
 
   def assert_paths(*paths)
@@ -131,7 +131,7 @@ class ViewLoadPathsTest < ActionController::TestCase
             "Decorated body",
             template.identifier,
             template.handler,
-                          virtual_path: template.virtual_path,
+              virtual_path: template.virtual_path,
               format: template.formats
           )
         end