1 files changed, 26 insertions, 27 deletions

diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb
index 3773900cc4..213829bd9e 100644
--- a/actionpack/test/controller/render_json_test.rb
+++ b/actionpack/test/controller/render_json_test.rb
@@ -1,18 +1,18 @@
-require 'abstract_unit'
-require 'controller/fake_models'
-require 'active_support/logger'
-require 'pathname'
+require "abstract_unit"
+require "controller/fake_models"
+require "active_support/logger"
+require "pathname"
 
 class RenderJsonTest < ActionController::TestCase
   class JsonRenderable
     def as_json(options={})
-      hash = { :a => :b, :c => :d, :e => :f }
+      hash = { a: :b, c: :d, e: :f }
       hash.except!(*options[:except]) if options[:except]
       hash
     end
 
     def to_json(options = {})
-      super :except => [:c, :e]
+      super except: [:c, :e]
     end
   end
 
@@ -20,47 +20,47 @@ class RenderJsonTest < ActionController::TestCase
     protect_from_forgery
 
     def self.controller_path
-      'test'
+      "test"
     end
 
     def render_json_nil
-      render :json => nil
+      render json: nil
     end
 
     def render_json_render_to_string
-      render plain: render_to_string(json: '[]')
+      render plain: render_to_string(json: "[]")
     end
 
     def render_json_hello_world
-      render :json => ActiveSupport::JSON.encode(:hello => 'world')
+      render json: ActiveSupport::JSON.encode(hello: "world")
     end
 
     def render_json_hello_world_with_status
-      render :json => ActiveSupport::JSON.encode(:hello => 'world'), :status => 401
+      render json: ActiveSupport::JSON.encode(hello: "world"), status: 401
     end
 
     def render_json_hello_world_with_callback
-      render :json => ActiveSupport::JSON.encode(:hello => 'world'), :callback => 'alert'
+      render json: ActiveSupport::JSON.encode(hello: "world"), callback: "alert"
     end
 
     def render_json_with_custom_content_type
-      render :json => ActiveSupport::JSON.encode(:hello => 'world'), :content_type => 'text/javascript'
+      render json: ActiveSupport::JSON.encode(hello: "world"), content_type: "text/javascript"
     end
 
     def render_symbol_json
-      render :json => ActiveSupport::JSON.encode(:hello => 'world')
+      render json: ActiveSupport::JSON.encode(hello: "world")
     end
 
     def render_json_with_render_to_string
-      render :json => {:hello => render_to_string(:partial => 'partial')}
+      render json: { hello: render_to_string(partial: "partial") }
     end
 
     def render_json_with_extra_options
-      render :json => JsonRenderable.new, :except => [:c, :e]
+      render json: JsonRenderable.new, except: [:c, :e]
     end
 
     def render_json_without_options
-      render :json => JsonRenderable.new
+      render json: JsonRenderable.new
     end
   end
 
@@ -77,20 +77,19 @@ class RenderJsonTest < ActionController::TestCase
 
   def test_render_json_nil
     get :render_json_nil
-    assert_equal 'null', @response.body
-    assert_equal 'application/json', @response.content_type
+    assert_equal "null", @response.body
+    assert_equal "application/json", @response.content_type
   end
 
   def test_render_json_render_to_string
     get :render_json_render_to_string
-    assert_equal '[]', @response.body
+    assert_equal "[]", @response.body
   end
 
-
   def test_render_json
     get :render_json_hello_world
     assert_equal '{"hello":"world"}', @response.body
-    assert_equal 'application/json', @response.content_type
+    assert_equal "application/json", @response.content_type
   end
 
   def test_render_json_with_status
@@ -102,31 +101,31 @@ class RenderJsonTest < ActionController::TestCase
   def test_render_json_with_callback
     get :render_json_hello_world_with_callback, xhr: true
     assert_equal '/**/alert({"hello":"world"})', @response.body
-    assert_equal 'text/javascript', @response.content_type
+    assert_equal "text/javascript", @response.content_type
   end
 
   def test_render_json_with_custom_content_type
     get :render_json_with_custom_content_type, xhr: true
     assert_equal '{"hello":"world"}', @response.body
-    assert_equal 'text/javascript', @response.content_type
+    assert_equal "text/javascript", @response.content_type
   end
 
   def test_render_symbol_json
     get :render_symbol_json
     assert_equal '{"hello":"world"}', @response.body
-    assert_equal 'application/json', @response.content_type
+    assert_equal "application/json", @response.content_type
   end
 
   def test_render_json_with_render_to_string
     get :render_json_with_render_to_string
     assert_equal '{"hello":"partial html"}', @response.body
-    assert_equal 'application/json', @response.content_type
+    assert_equal "application/json", @response.content_type
   end
 
   def test_render_json_forwards_extra_options
     get :render_json_with_extra_options
     assert_equal '{"a":"b"}', @response.body
-    assert_equal 'application/json', @response.content_type
+    assert_equal "application/json", @response.content_type
   end
 
   def test_render_json_calls_to_json_from_object