3 files changed, 10 insertions, 11 deletions
diff --git a/actionview/test/actionpack/controller/layout_test.rb b/actionview/test/actionpack/controller/layout_test.rb
index 00147d31f3..b79835ff34 100644
--- a/actionview/test/actionpack/controller/layout_test.rb
+++ b/actionview/test/actionpack/controller/layout_test.rb
@@ -1,6 +1,5 @@
 require "abstract_unit"
 require "active_support/core_ext/array/extract_options"
-require "active_support/core_ext/regexp"
 
 # The view_paths array must be set on Base and not LayoutTest so that LayoutTest's inherited
 # method has access to the view_paths array when looking for a layout to automatically assign.
@@ -253,7 +252,7 @@ class LayoutStatusIsRenderedTest < ActionController::TestCase
   end
 end
 
-unless /mswin|mingw/.match?(RbConfig::CONFIG["host_os"])
+unless Gem.win_platform?
   class LayoutSymlinkedTest < LayoutTest
     layout "symlinked/symlinked_layout"
   end
diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb
index 453c2e75d6..b4a757d6b8 100644
--- a/actionview/test/actionpack/controller/render_test.rb
+++ b/actionview/test/actionpack/controller/render_test.rb
@@ -11,7 +11,7 @@ class Customer < Struct.new(:name, :id)
 
   undef_method :to_json
 
-  def to_xml(options={})
+  def to_xml(options = {})
     if options[:builder]
       options[:builder].name name
     else
@@ -19,7 +19,7 @@ class Customer < Struct.new(:name, :id)
     end
   end
 
-  def to_js(options={})
+  def to_js(options = {})
     "name: #{name.inspect}"
   end
   alias :to_text :to_js
@@ -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 9471c76921..4c58b959a9 100644
--- a/actionview/test/actionpack/controller/view_paths_test.rb
+++ b/actionview/test/actionpack/controller/view_paths_test.rb
@@ -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)