diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 72629a0995..c633dcfe99 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -70,8 +70,8 @@ module AbstractController private # Normalize args by converting render "foo" to - # render :action => "foo" and render "foo/bar" to - # render :file => "foo/bar". + # render action: "foo" and render "foo/bar" to + # render file: "foo/bar". def _normalize_args(action = nil, options = {}) # :doc: if action.respond_to?(:permitted?) if action.permitted? diff --git a/actionpack/test/controller/new_base/render_partial_test.rb b/actionpack/test/controller/new_base/render_partial_test.rb index a0c7cbc686..ced630289b 100644 --- a/actionpack/test/controller/new_base/render_partial_test.rb +++ b/actionpack/test/controller/new_base/render_partial_test.rb @@ -6,11 +6,11 @@ module RenderPartial class BasicController < ActionController::Base self.view_paths = [ActionView::FixtureResolver.new( "render_partial/basic/_basic.html.erb" => "BasicPartial!", - "render_partial/basic/basic.html.erb" => "<%= @test_unchanged = 'goodbye' %><%= render :partial => 'basic' %><%= @test_unchanged %>", - "render_partial/basic/with_json.html.erb" => "<%= render :partial => 'with_json', :formats => [:json] %>", - "render_partial/basic/_with_json.json.erb" => "<%= render :partial => 'final', :formats => [:json] %>", + "render_partial/basic/basic.html.erb" => "<%= @test_unchanged = 'goodbye' %><%= render partial: 'basic' %><%= @test_unchanged %>", + "render_partial/basic/with_json.html.erb" => "<%= render partial: 'with_json', formats: [:json] %>", + "render_partial/basic/_with_json.json.erb" => "<%= render partial: 'final', formats: [:json] %>", "render_partial/basic/_final.json.erb" => "{ final: json }", - "render_partial/basic/overridden.html.erb" => "<%= @test_unchanged = 'goodbye' %><%= render :partial => 'overridden' %><%= @test_unchanged %>", + "render_partial/basic/overridden.html.erb" => "<%= @test_unchanged = 'goodbye' %><%= render partial: 'overridden' %><%= @test_unchanged %>", "render_partial/basic/_overridden.html.erb" => "ParentPartial!", "render_partial/child/_overridden.html.erb" => "OverriddenPartial!" )] diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb index 270f75eb9e..9596142f2c 100644 --- a/actionpack/test/controller/new_base/render_template_test.rb +++ b/actionpack/test/controller/new_base/render_template_test.rb @@ -12,8 +12,8 @@ module RenderTemplate "with_raw.html.erb" => "Hello <%=raw 'this is raw' %>", "with_implicit_raw.html.erb" => "Hello <%== 'this is also raw' %> in an html template", "with_implicit_raw.text.erb" => "Hello <%== 'this is also raw' %> in a text template", - "test/with_json.html.erb" => "<%= render :template => 'test/with_json', :formats => [:json] %>", - "test/with_json.json.erb" => "<%= render :template => 'test/final', :formats => [:json] %>", + "test/with_json.html.erb" => "<%= render template: 'test/with_json', formats: [:json] %>", + "test/with_json.json.erb" => "<%= render template: 'test/final', formats: [:json] %>", "test/final.json.erb" => "{ final: json }", "test/with_error.html.erb" => "<%= raise 'i do not exist' %>" )] diff --git a/actionpack/test/fixtures/functional_caching/html_fragment_cached_with_partial.html.erb b/actionpack/test/fixtures/functional_caching/html_fragment_cached_with_partial.html.erb index a9462d3499..d81c5a1b61 100644 --- a/actionpack/test/fixtures/functional_caching/html_fragment_cached_with_partial.html.erb +++ b/actionpack/test/fixtures/functional_caching/html_fragment_cached_with_partial.html.erb @@ -1 +1 @@ -<%= render :partial => 'partial' %> \ No newline at end of file +<%= render partial: 'partial' %> \ No newline at end of file diff --git a/actionpack/test/fixtures/functional_caching/inline_fragment_cached.html.erb b/actionpack/test/fixtures/functional_caching/inline_fragment_cached.html.erb index 41647f1404..bc8decb972 100644 --- a/actionpack/test/fixtures/functional_caching/inline_fragment_cached.html.erb +++ b/actionpack/test/fixtures/functional_caching/inline_fragment_cached.html.erb @@ -1,2 +1,2 @@ -<%= render :inline => 'Some inline content' %> +<%= render inline: 'Some inline content' %> <%= cache do %>Some cached content<% end %> diff --git a/actionpack/test/fixtures/layouts/with_html_partial.html.erb b/actionpack/test/fixtures/layouts/with_html_partial.html.erb index fd2896aeaa..e84401f360 100644 --- a/actionpack/test/fixtures/layouts/with_html_partial.html.erb +++ b/actionpack/test/fixtures/layouts/with_html_partial.html.erb @@ -1 +1 @@ -<%= render :partial => "partial_only_html" %><%= yield %> +<%= render partial: "partial_only_html" %><%= yield %> diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb index 585bf6c610..ae30f5435a 100644 --- a/actionview/lib/action_view/rendering.rb +++ b/actionview/lib/action_view/rendering.rb @@ -129,8 +129,8 @@ module ActionView lookup_context.formats = [format.to_sym] if format.to_sym end - # Normalize args by converting render "foo" to render :action => "foo" and - # render "foo/bar" to render :template => "foo/bar". + # Normalize args by converting render "foo" to render action: "foo" and + # render "foo/bar" to render template: "foo/bar". def _normalize_args(action = nil, options = {}) options = super(action, options) case action diff --git a/actionview/test/fixtures/actionpack/layouts/_partial_and_yield.erb b/actionview/test/fixtures/actionpack/layouts/_partial_and_yield.erb index 74cc428ffa..4cf245bc89 100644 --- a/actionview/test/fixtures/actionpack/layouts/_partial_and_yield.erb +++ b/actionview/test/fixtures/actionpack/layouts/_partial_and_yield.erb @@ -1,2 +1,2 @@ -<%= render :partial => 'test/partial' %> +<%= render partial: 'test/partial' %> <%= yield %> diff --git a/actionview/test/fixtures/actionpack/layouts/with_html_partial.html.erb b/actionview/test/fixtures/actionpack/layouts/with_html_partial.html.erb index fd2896aeaa..e84401f360 100644 --- a/actionview/test/fixtures/actionpack/layouts/with_html_partial.html.erb +++ b/actionview/test/fixtures/actionpack/layouts/with_html_partial.html.erb @@ -1 +1 @@ -<%= render :partial => "partial_only_html" %><%= yield %> +<%= render partial: "partial_only_html" %><%= yield %> diff --git a/actionview/test/fixtures/actionpack/layouts/yield_with_render_inline_inside.erb b/actionview/test/fixtures/actionpack/layouts/yield_with_render_inline_inside.erb index 7298d79690..3582285d03 100644 --- a/actionview/test/fixtures/actionpack/layouts/yield_with_render_inline_inside.erb +++ b/actionview/test/fixtures/actionpack/layouts/yield_with_render_inline_inside.erb @@ -1,2 +1,2 @@ -<%= render :inline => 'welcome' %> +<%= render inline: 'welcome' %> <%= yield %> diff --git a/actionview/test/fixtures/actionpack/layouts/yield_with_render_partial_inside.erb b/actionview/test/fixtures/actionpack/layouts/yield_with_render_partial_inside.erb index 74cc428ffa..4cf245bc89 100644 --- a/actionview/test/fixtures/actionpack/layouts/yield_with_render_partial_inside.erb +++ b/actionview/test/fixtures/actionpack/layouts/yield_with_render_partial_inside.erb @@ -1,2 +1,2 @@ -<%= render :partial => 'test/partial' %> +<%= render partial: 'test/partial' %> <%= yield %> diff --git a/actionview/test/fixtures/actionpack/test/_first_json_partial.json.erb b/actionview/test/fixtures/actionpack/test/_first_json_partial.json.erb index 790ee896db..a9950d8e28 100644 --- a/actionview/test/fixtures/actionpack/test/_first_json_partial.json.erb +++ b/actionview/test/fixtures/actionpack/test/_first_json_partial.json.erb @@ -1 +1 @@ -<%= render :partial => "test/second_json_partial" %> \ No newline at end of file +<%= render partial: "test/second_json_partial" %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/change_priority.html.erb b/actionview/test/fixtures/actionpack/test/change_priority.html.erb index 5618977d05..5c5f1916b6 100644 --- a/actionview/test/fixtures/actionpack/test/change_priority.html.erb +++ b/actionview/test/fixtures/actionpack/test/change_priority.html.erb @@ -1,2 +1,2 @@ -<%= render :partial => "test/json_change_priority", formats: :json %> -HTML Template, but <%= render :partial => "test/changing_priority" %> partial \ No newline at end of file +<%= render partial: "test/json_change_priority", formats: :json %> +HTML Template, but <%= render partial: "test/changing_priority" %> partial \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/html_template.html.erb b/actionview/test/fixtures/actionpack/test/html_template.html.erb index 1bbc2b7f09..f4664b6eef 100644 --- a/actionview/test/fixtures/actionpack/test/html_template.html.erb +++ b/actionview/test/fixtures/actionpack/test/html_template.html.erb @@ -1 +1 @@ -<%= render :partial => "test/first_json_partial", formats: :json %> \ No newline at end of file +<%= render partial: "test/first_json_partial", formats: :json %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/list.erb b/actionview/test/fixtures/actionpack/test/list.erb index 0a4bda58ee..66ff70c2cc 100644 --- a/actionview/test/fixtures/actionpack/test/list.erb +++ b/actionview/test/fixtures/actionpack/test/list.erb @@ -1 +1 @@ -<%= @test_unchanged = 'goodbye' %><%= render :partial => 'customer', :collection => @customers %><%= @test_unchanged %> +<%= @test_unchanged = 'goodbye' %><%= render partial: 'customer', collection: @customers %><%= @test_unchanged %> diff --git a/actionview/test/fixtures/actionpack/test/potential_conflicts.erb b/actionview/test/fixtures/actionpack/test/potential_conflicts.erb index a5e964e359..622dcd3424 100644 --- a/actionview/test/fixtures/actionpack/test/potential_conflicts.erb +++ b/actionview/test/fixtures/actionpack/test/potential_conflicts.erb @@ -1,4 +1,4 @@ First: <%= @name %> -<%= render :partial => "person", :locals => { :name => "Stephan" } -%> +<%= render partial: "person", locals: { name: "Stephan" } -%> Fourth: <%= @name %> Fifth: <%= name %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/render_file_from_template.html.erb b/actionview/test/fixtures/actionpack/test/render_file_from_template.html.erb index fde9f4bb64..bbd65b1452 100644 --- a/actionview/test/fixtures/actionpack/test/render_file_from_template.html.erb +++ b/actionview/test/fixtures/actionpack/test/render_file_from_template.html.erb @@ -1 +1 @@ -<%= render :file => @path %> \ No newline at end of file +<%= render file: @path %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/render_two_partials.html.erb b/actionview/test/fixtures/actionpack/test/render_two_partials.html.erb index 3db6025860..4b48017566 100644 --- a/actionview/test/fixtures/actionpack/test/render_two_partials.html.erb +++ b/actionview/test/fixtures/actionpack/test/render_two_partials.html.erb @@ -1,2 +1,2 @@ -<%= render :partial => 'partial', :locals => {'first' => '1'} %> -<%= render :partial => 'partial', :locals => {'second' => '2'} %> +<%= render partial: 'partial', locals: {'first' => '1'} %> +<%= render partial: 'partial', locals: {'second' => '2'} %> diff --git a/actionview/test/fixtures/actionpack/test/with_html_partial.html.erb b/actionview/test/fixtures/actionpack/test/with_html_partial.html.erb index d84d909d64..7d50d01862 100644 --- a/actionview/test/fixtures/actionpack/test/with_html_partial.html.erb +++ b/actionview/test/fixtures/actionpack/test/with_html_partial.html.erb @@ -1 +1 @@ -<%= render :partial => "partial_only_html" %> +<%= render partial: "partial_only_html" %> diff --git a/actionview/test/fixtures/actionpack/test/with_partial.html.erb b/actionview/test/fixtures/actionpack/test/with_partial.html.erb index 7502364cf5..567fa79267 100644 --- a/actionview/test/fixtures/actionpack/test/with_partial.html.erb +++ b/actionview/test/fixtures/actionpack/test/with_partial.html.erb @@ -1 +1 @@ -<%= render :partial => "partial_only" %> +<%= render partial: "partial_only" %> diff --git a/actionview/test/fixtures/actionpack/test/with_partial.text.erb b/actionview/test/fixtures/actionpack/test/with_partial.text.erb index 5f068ebf27..61b4e4905d 100644 --- a/actionview/test/fixtures/actionpack/test/with_partial.text.erb +++ b/actionview/test/fixtures/actionpack/test/with_partial.text.erb @@ -1 +1 @@ -**<%= render :partial => "partial_only" %>** +**<%= render partial: "partial_only" %>** diff --git a/actionview/test/fixtures/actionpack/test/with_xml_template.html.erb b/actionview/test/fixtures/actionpack/test/with_xml_template.html.erb index e54a7cd001..be768042c4 100644 --- a/actionview/test/fixtures/actionpack/test/with_xml_template.html.erb +++ b/actionview/test/fixtures/actionpack/test/with_xml_template.html.erb @@ -1 +1 @@ -<%= render :template => "test/greeting", :formats => :xml %> +<%= render template: "test/greeting", formats: :xml %> diff --git a/actionview/test/fixtures/layouts/_partial_and_yield.erb b/actionview/test/fixtures/layouts/_partial_and_yield.erb index 74cc428ffa..4cf245bc89 100644 --- a/actionview/test/fixtures/layouts/_partial_and_yield.erb +++ b/actionview/test/fixtures/layouts/_partial_and_yield.erb @@ -1,2 +1,2 @@ -<%= render :partial => 'test/partial' %> +<%= render partial: 'test/partial' %> <%= yield %> diff --git a/actionview/test/fixtures/layouts/render_partial_html.erb b/actionview/test/fixtures/layouts/render_partial_html.erb index d4dbb6c76c..1852f2cc1e 100644 --- a/actionview/test/fixtures/layouts/render_partial_html.erb +++ b/actionview/test/fixtures/layouts/render_partial_html.erb @@ -1,2 +1,2 @@ -<%= render :partial => 'test/partialhtml' %> +<%= render partial: 'test/partialhtml' %> <%= yield %> diff --git a/actionview/test/fixtures/layouts/yield_with_render_inline_inside.erb b/actionview/test/fixtures/layouts/yield_with_render_inline_inside.erb index 7298d79690..3582285d03 100644 --- a/actionview/test/fixtures/layouts/yield_with_render_inline_inside.erb +++ b/actionview/test/fixtures/layouts/yield_with_render_inline_inside.erb @@ -1,2 +1,2 @@ -<%= render :inline => 'welcome' %> +<%= render inline: 'welcome' %> <%= yield %> diff --git a/actionview/test/fixtures/layouts/yield_with_render_partial_inside.erb b/actionview/test/fixtures/layouts/yield_with_render_partial_inside.erb index 74cc428ffa..4cf245bc89 100644 --- a/actionview/test/fixtures/layouts/yield_with_render_partial_inside.erb +++ b/actionview/test/fixtures/layouts/yield_with_render_partial_inside.erb @@ -1,2 +1,2 @@ -<%= render :partial => 'test/partial' %> +<%= render partial: 'test/partial' %> <%= yield %> diff --git a/actionview/test/fixtures/test/_first_json_partial.json.erb b/actionview/test/fixtures/test/_first_json_partial.json.erb index 790ee896db..a9950d8e28 100644 --- a/actionview/test/fixtures/test/_first_json_partial.json.erb +++ b/actionview/test/fixtures/test/_first_json_partial.json.erb @@ -1 +1 @@ -<%= render :partial => "test/second_json_partial" %> \ No newline at end of file +<%= render partial: "test/second_json_partial" %> \ No newline at end of file diff --git a/actionview/test/fixtures/test/_layout_with_partial_and_yield.html.erb b/actionview/test/fixtures/test/_layout_with_partial_and_yield.html.erb index 820e7db789..62a8af7cdf 100644 --- a/actionview/test/fixtures/test/_layout_with_partial_and_yield.html.erb +++ b/actionview/test/fixtures/test/_layout_with_partial_and_yield.html.erb @@ -1,4 +1,4 @@ Before -<%= render :partial => "test/partial" %> +<%= render partial: "test/partial" %> <%= yield %> After diff --git a/actionview/test/fixtures/test/_one.html.erb b/actionview/test/fixtures/test/_one.html.erb index f796291cb4..4a42b079a1 100644 --- a/actionview/test/fixtures/test/_one.html.erb +++ b/actionview/test/fixtures/test/_one.html.erb @@ -1 +1 @@ -<%= render :partial => "two" %> world +<%= render partial: "two" %> world diff --git a/actionview/test/fixtures/test/_partial_with_layout.erb b/actionview/test/fixtures/test/_partial_with_layout.erb index 2a50c834fe..bf673d8ea6 100644 --- a/actionview/test/fixtures/test/_partial_with_layout.erb +++ b/actionview/test/fixtures/test/_partial_with_layout.erb @@ -1,2 +1,2 @@ -<%= render :partial => 'test/partial', :layout => 'test/layout_for_partial', :locals => { :name => 'Bar!' } %> +<%= render partial: 'test/partial', layout: 'test/layout_for_partial', locals: { name: 'Bar!' } %> partial with layout diff --git a/actionview/test/fixtures/test/_partial_with_layout_block_content.erb b/actionview/test/fixtures/test/_partial_with_layout_block_content.erb index 65dafd93a8..b4e6587237 100644 --- a/actionview/test/fixtures/test/_partial_with_layout_block_content.erb +++ b/actionview/test/fixtures/test/_partial_with_layout_block_content.erb @@ -1,4 +1,4 @@ -<%= render :layout => 'test/layout_for_partial', :locals => { :name => 'Bar!' } do %> +<%= render layout: 'test/layout_for_partial', locals: { name: 'Bar!' } do %> Content from inside layout! <% end %> partial with layout diff --git a/actionview/test/fixtures/test/_partial_with_layout_block_partial.erb b/actionview/test/fixtures/test/_partial_with_layout_block_partial.erb index 444197a7d0..68f74947bd 100644 --- a/actionview/test/fixtures/test/_partial_with_layout_block_partial.erb +++ b/actionview/test/fixtures/test/_partial_with_layout_block_partial.erb @@ -1,4 +1,4 @@ -<%= render :layout => 'test/layout_for_partial', :locals => { :name => 'Bar!' } do %> +<%= render layout: 'test/layout_for_partial', locals: { name: 'Bar!' } do %> <%= render 'test/partial' %> <% end %> partial with layout diff --git a/actionview/test/fixtures/test/change_priority.html.erb b/actionview/test/fixtures/test/change_priority.html.erb index 5618977d05..5c5f1916b6 100644 --- a/actionview/test/fixtures/test/change_priority.html.erb +++ b/actionview/test/fixtures/test/change_priority.html.erb @@ -1,2 +1,2 @@ -<%= render :partial => "test/json_change_priority", formats: :json %> -HTML Template, but <%= render :partial => "test/changing_priority" %> partial \ No newline at end of file +<%= render partial: "test/json_change_priority", formats: :json %> +HTML Template, but <%= render partial: "test/changing_priority" %> partial \ No newline at end of file diff --git a/actionview/test/fixtures/test/html_template.html.erb b/actionview/test/fixtures/test/html_template.html.erb index 1bbc2b7f09..f4664b6eef 100644 --- a/actionview/test/fixtures/test/html_template.html.erb +++ b/actionview/test/fixtures/test/html_template.html.erb @@ -1 +1 @@ -<%= render :partial => "test/first_json_partial", formats: :json %> \ No newline at end of file +<%= render partial: "test/first_json_partial", formats: :json %> \ No newline at end of file diff --git a/actionview/test/fixtures/test/layout_render_object.erb b/actionview/test/fixtures/test/layout_render_object.erb index acc4453c08..4aa72412a1 100644 --- a/actionview/test/fixtures/test/layout_render_object.erb +++ b/actionview/test/fixtures/test/layout_render_object.erb @@ -1 +1 @@ -<%= render :layout => "layouts/customers" do |customer| %><%= customer.name %><% end %> \ No newline at end of file +<%= render layout: "layouts/customers" do |customer| %><%= customer.name %><% end %> \ No newline at end of file diff --git a/actionview/test/fixtures/test/list.erb b/actionview/test/fixtures/test/list.erb index 0a4bda58ee..66ff70c2cc 100644 --- a/actionview/test/fixtures/test/list.erb +++ b/actionview/test/fixtures/test/list.erb @@ -1 +1 @@ -<%= @test_unchanged = 'goodbye' %><%= render :partial => 'customer', :collection => @customers %><%= @test_unchanged %> +<%= @test_unchanged = 'goodbye' %><%= render partial: 'customer', collection: @customers %><%= @test_unchanged %> diff --git a/actionview/test/fixtures/test/nested_layout.erb b/actionview/test/fixtures/test/nested_layout.erb index 6078f74b4c..ea2a882b34 100644 --- a/actionview/test/fixtures/test/nested_layout.erb +++ b/actionview/test/fixtures/test/nested_layout.erb @@ -1,3 +1,3 @@ <% content_for :title, "title" -%> <% content_for :column do -%>column<% end -%> -<%= render :layout => 'layouts/column' do -%>content<% end -%> \ No newline at end of file +<%= render layout: 'layouts/column' do -%>content<% end -%> \ No newline at end of file diff --git a/actionview/test/fixtures/test/nested_streaming.erb b/actionview/test/fixtures/test/nested_streaming.erb index 55525e0c92..44976cf1cc 100644 --- a/actionview/test/fixtures/test/nested_streaming.erb +++ b/actionview/test/fixtures/test/nested_streaming.erb @@ -1,3 +1,3 @@ <%- content_for :header do -%>?<%- end -%> -<%= render :template => "test/streaming" %> +<%= render template: "test/streaming" %> ? \ No newline at end of file diff --git a/actionview/test/fixtures/test/one.html.erb b/actionview/test/fixtures/test/one.html.erb index 0151874809..a3136cc13a 100644 --- a/actionview/test/fixtures/test/one.html.erb +++ b/actionview/test/fixtures/test/one.html.erb @@ -1 +1 @@ -<%= render :partial => "test/two" %> world \ No newline at end of file +<%= render partial: "test/two" %> world \ No newline at end of file diff --git a/actionview/test/fixtures/test/render_two_partials.html.erb b/actionview/test/fixtures/test/render_two_partials.html.erb index 3db6025860..4b48017566 100644 --- a/actionview/test/fixtures/test/render_two_partials.html.erb +++ b/actionview/test/fixtures/test/render_two_partials.html.erb @@ -1,2 +1,2 @@ -<%= render :partial => 'partial', :locals => {'first' => '1'} %> -<%= render :partial => 'partial', :locals => {'second' => '2'} %> +<%= render partial: 'partial', locals: {'first' => '1'} %> +<%= render partial: 'partial', locals: {'second' => '2'} %> diff --git a/actionview/test/fixtures/test/sub_template_raise.html.erb b/actionview/test/fixtures/test/sub_template_raise.html.erb index f38c0bda90..07e19a4ee2 100644 --- a/actionview/test/fixtures/test/sub_template_raise.html.erb +++ b/actionview/test/fixtures/test/sub_template_raise.html.erb @@ -1 +1 @@ -<%= render :partial => "test/raise" %> \ No newline at end of file +<%= render partial: "test/raise" %> \ No newline at end of file diff --git a/actionview/test/fixtures/test/utf8.html.erb b/actionview/test/fixtures/test/utf8.html.erb index ac98c2f012..5779342105 100644 --- a/actionview/test/fixtures/test/utf8.html.erb +++ b/actionview/test/fixtures/test/utf8.html.erb @@ -1,4 +1,4 @@ -Русский <%= render :partial => 'test/utf8_partial' %> +Русский <%= render partial: 'test/utf8_partial' %> <%= "日".encoding %> <%= @output_buffer.encoding %> <%= __ENCODING__ %> diff --git a/actionview/test/fixtures/test/utf8_magic.html.erb b/actionview/test/fixtures/test/utf8_magic.html.erb index 257279c29f..41501b7af7 100644 --- a/actionview/test/fixtures/test/utf8_magic.html.erb +++ b/actionview/test/fixtures/test/utf8_magic.html.erb @@ -1,5 +1,5 @@ <%# encoding: utf-8 -%> -Русский <%= render :partial => 'test/utf8_partial_magic' %> +Русский <%= render partial: 'test/utf8_partial_magic' %> <%= "日".encoding %> <%= @output_buffer.encoding %> <%= __ENCODING__ %> diff --git a/actionview/test/fixtures/test/utf8_magic_with_bare_partial.html.erb b/actionview/test/fixtures/test/utf8_magic_with_bare_partial.html.erb index cb22692f9a..d9c231c84a 100644 --- a/actionview/test/fixtures/test/utf8_magic_with_bare_partial.html.erb +++ b/actionview/test/fixtures/test/utf8_magic_with_bare_partial.html.erb @@ -1,5 +1,5 @@ <%# encoding: utf-8 -%> -Русский <%= render :partial => 'test/utf8_partial' %> +Русский <%= render partial: 'test/utf8_partial' %> <%= "日".encoding %> <%= @output_buffer.encoding %> <%= __ENCODING__ %> diff --git a/actionview/test/fixtures/with_format.json.erb b/actionview/test/fixtures/with_format.json.erb index a7f480ab1d..1b1d4e82f2 100644 --- a/actionview/test/fixtures/with_format.json.erb +++ b/actionview/test/fixtures/with_format.json.erb @@ -1 +1 @@ -<%= render :partial => 'missing', :formats => [:json] %> +<%= render partial: 'missing', formats: [:json] %> diff --git a/actionview/test/template/dependency_tracker_test.rb b/actionview/test/template/dependency_tracker_test.rb index 9e29a69fd7..509bc898c5 100644 --- a/actionview/test/template/dependency_tracker_test.rb +++ b/actionview/test/template/dependency_tracker_test.rb @@ -115,8 +115,8 @@ module SharedTrackerTests def test_finds_dependency_on_multiline_render_calls template = FakeTemplate.new("<%= - render :object => @all_posts, - :partial => 'posts' %>", :erb) + render object: @all_posts, + partial: 'posts' %>", :erb) tracker = make_tracker("some/_little_posts", template) diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb index 624caacc5b..4e6b66c15e 100644 --- a/railties/test/application/initializers/frameworks_test.rb +++ b/railties/test/application/initializers/frameworks_test.rb @@ -82,11 +82,11 @@ module ApplicationTests app_file "app/controllers/foo_controller.rb", <<-RUBY class FooController < ApplicationController def included_helpers - render :inline => "<%= from_app_helper -%> <%= from_foo_helper %>" + render inline: "<%= from_app_helper -%> <%= from_foo_helper %>" end def not_included_helper - render :inline => "<%= respond_to?(:from_bar_helper) -%>" + render inline: "<%= respond_to?(:from_bar_helper) -%>" end end RUBY diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb index 7cf672a8c8..9bf713279e 100644 --- a/railties/test/railties/engine_test.rb +++ b/railties/test/railties/engine_test.rb @@ -1247,11 +1247,11 @@ en: controller "main", <<-RUBY class MainController < ActionController::Base def foo - render inline: '<%= render :partial => "shared/foo" %>' + render inline: '<%= render partial: "shared/foo" %>' end def bar - render inline: '<%= render :partial => "shared/bar" %>' + render inline: '<%= render partial: "shared/bar" %>' end end RUBY @@ -1347,7 +1347,7 @@ en: controller "main", <<-RUBY class MainController < ActionController::Base def foo - render inline: '<%= render :partial => "shared/foo" %>' + render inline: '<%= render partial: "shared/foo" %>' end end RUBY