mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Use new hash syntax
This commit is contained in:
parent
b643d7a7c6
commit
440b334cbb
3 changed files with 8 additions and 8 deletions
|
@ -2,7 +2,7 @@ require 'abstract_unit'
|
||||||
|
|
||||||
class RedirectToApiController < ActionController::API
|
class RedirectToApiController < ActionController::API
|
||||||
def one
|
def one
|
||||||
redirect_to :action => "two"
|
redirect_to action: "two"
|
||||||
end
|
end
|
||||||
|
|
||||||
def two; end
|
def two; end
|
||||||
|
|
|
@ -4,20 +4,20 @@ require 'active_support/core_ext/hash/conversions'
|
||||||
class RenderersApiController < ActionController::API
|
class RenderersApiController < ActionController::API
|
||||||
class Model
|
class Model
|
||||||
def to_json(options = {})
|
def to_json(options = {})
|
||||||
{ :a => 'b' }.to_json(options)
|
{ a: 'b' }.to_json(options)
|
||||||
end
|
end
|
||||||
|
|
||||||
def to_xml(options = {})
|
def to_xml(options = {})
|
||||||
{ :a => 'b' }.to_xml(options)
|
{ a: 'b' }.to_xml(options)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def one
|
def one
|
||||||
render :json => Model.new
|
render json: Model.new
|
||||||
end
|
end
|
||||||
|
|
||||||
def two
|
def two
|
||||||
render :xml => Model.new
|
render xml: Model.new
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -27,12 +27,12 @@ class RenderersApiTest < ActionController::TestCase
|
||||||
def test_render_json
|
def test_render_json
|
||||||
get :one
|
get :one
|
||||||
assert_response :success
|
assert_response :success
|
||||||
assert_equal({ :a => 'b' }.to_json, @response.body)
|
assert_equal({ a: 'b' }.to_json, @response.body)
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_render_xml
|
def test_render_xml
|
||||||
get :two
|
get :two
|
||||||
assert_response :success
|
assert_response :success
|
||||||
assert_equal({ :a => 'b' }.to_xml, @response.body)
|
assert_equal({ a: 'b' }.to_xml, @response.body)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -140,7 +140,7 @@ module ApplicationTests
|
||||||
app_file "app/controllers/omg_controller.rb", <<-RUBY
|
app_file "app/controllers/omg_controller.rb", <<-RUBY
|
||||||
class OmgController < ApplicationController
|
class OmgController < ApplicationController
|
||||||
def show
|
def show
|
||||||
render :json => { :omg => 'omg' }
|
render json: { omg: 'omg' }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
RUBY
|
RUBY
|
||||||
|
|
Loading…
Reference in a new issue