Revert "Revert "Merge pull request rails#16888 from jejacks0n/render_template""

This reverts commit 585e756.

Conflicts:
	actionview/CHANGELOG.md
	guides/source/4_2_release_notes.md

Author: chancancode

actionview/CHANGELOG.md

@@ -1,3 +1,14 @@
+*   Changed the meaning of `render "foo/bar"`.
+
+    Previously, calling `render "foo/bar"` in a controller action is equivalent
+    to `render file: "foo/bar"`. In Rails 4.2, this has been changed to mean
+    `render template: "foo/bar"` instead. If you need to render a file, please
+    change your code to use the explicit form (`render file: "foo/bar"`) instead.
+
+    *Jeremy Jackson*
+
+*   Add support for ARIA attributes in tags.
+
 *   Fix stripping the digest from the automatically generated img tag alt
     attribute when assets are handled by Sprockets >=3.0.
 

actionview/lib/action_view/rendering.rb

@@ -107,7 +107,7 @@ def _process_format(format, options = {}) #:nodoc:
       end
 
       # Normalize args by converting render "foo" to render :action => "foo" and
-      # render "foo/bar" to render :file => "foo/bar".
+      # render "foo/bar" to render :template => "foo/bar".
       # :api: private
       def _normalize_args(action=nil, options={})
         options = super(action, options)
@@ -117,7 +117,7 @@ def _normalize_args(action=nil, options={})
           options = action
         when String, Symbol
           action = action.to_s
-          key = action.include?(?/) ? :file : :action
+          key = action.include?(?/) ? :template : :action
           options[key] = action
         else
           options[:partial] = action

actionview/test/actionpack/controller/render_test.rb

@@ -91,17 +91,17 @@ def hello_world_file
 
   # :ported:
   def render_hello_world
-    render :template => "test/hello_world"
+    render "test/hello_world"
   end
 
   def render_hello_world_with_last_modified_set
     response.last_modified = Date.new(2008, 10, 10).to_time
-    render :template => "test/hello_world"
+    render "test/hello_world"
   end
 
   # :ported: compatibility
   def render_hello_world_with_forward_slash
-    render :template => "/test/hello_world"
+    render "/test/hello_world"
   end
 
   # :ported:
@@ -111,7 +111,7 @@ def render_template_in_top_directory
 
   # :deprecated:
   def render_template_in_top_directory_with_slash
-    render :template => '/shared'
+    render '/shared'
   end
 
   # :ported:
@@ -159,13 +159,6 @@ def render_file_with_instance_variables
     render :file => path
   end
 
-  # :ported:
-  def render_file_as_string_with_instance_variables
-    @secret = 'in the sauce'
-    path = File.expand_path(File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_ivar'))
-    render path
-  end
-
   # :ported:
   def render_file_not_using_full_path
     @secret = 'in the sauce'
@@ -194,7 +187,7 @@ def render_file_with_locals
 
   def render_file_as_string_with_locals
     path = File.expand_path(File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_locals'))
-    render path, :locals => {:secret => 'in the sauce'}
+    render file: path, :locals => {:secret => 'in the sauce'}
   end
 
   def accessing_request_in_template
@@ -780,12 +773,6 @@ def test_render_file
     assert_equal "Hello world!", @response.body
   end
 
-  # :ported:
-  def test_render_file_as_string_with_instance_variables
-    get :render_file_as_string_with_instance_variables
-    assert_equal "The secret is in the sauce\n", @response.body
-  end
-
   # :ported:
   def test_render_file_not_using_full_path
     get :render_file_not_using_full_path