diff options
-rw-r--r-- | actionpack/test/controller/api/redirect_to_test.rb | 2 | ||||
-rw-r--r-- | actionpack/test/controller/api/renderers_test.rb | 12 | ||||
-rw-r--r-- | railties/test/application/initializers/frameworks_test.rb | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/actionpack/test/controller/api/redirect_to_test.rb b/actionpack/test/controller/api/redirect_to_test.rb index 67832d7dba..18877c4b3a 100644 --- a/actionpack/test/controller/api/redirect_to_test.rb +++ b/actionpack/test/controller/api/redirect_to_test.rb @@ -2,7 +2,7 @@ require 'abstract_unit' class RedirectToApiController < ActionController::API def one - redirect_to :action => "two" + redirect_to action: "two" end def two; end diff --git a/actionpack/test/controller/api/renderers_test.rb b/actionpack/test/controller/api/renderers_test.rb index d99eb0cf13..9405538833 100644 --- a/actionpack/test/controller/api/renderers_test.rb +++ b/actionpack/test/controller/api/renderers_test.rb @@ -4,20 +4,20 @@ require 'active_support/core_ext/hash/conversions' class RenderersApiController < ActionController::API class Model def to_json(options = {}) - { :a => 'b' }.to_json(options) + { a: 'b' }.to_json(options) end def to_xml(options = {}) - { :a => 'b' }.to_xml(options) + { a: 'b' }.to_xml(options) end end def one - render :json => Model.new + render json: Model.new end def two - render :xml => Model.new + render xml: Model.new end end @@ -27,12 +27,12 @@ class RenderersApiTest < ActionController::TestCase def test_render_json get :one assert_response :success - assert_equal({ :a => 'b' }.to_json, @response.body) + assert_equal({ a: 'b' }.to_json, @response.body) end def test_render_xml get :two assert_response :success - assert_equal({ :a => 'b' }.to_xml, @response.body) + assert_equal({ a: 'b' }.to_xml, @response.body) end end diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb index 709286d728..af98e08d0e 100644 --- a/railties/test/application/initializers/frameworks_test.rb +++ b/railties/test/application/initializers/frameworks_test.rb @@ -140,7 +140,7 @@ module ApplicationTests app_file "app/controllers/omg_controller.rb", <<-RUBY class OmgController < ApplicationController def show - render :json => { :omg => 'omg' } + render json: { omg: 'omg' } end end RUBY |