1 files changed, 62 insertions, 19 deletions

diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 79e2104789..256ebf6a07 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -1,6 +1,5 @@
 require 'abstract_unit'
 require 'controller/fake_models'
-require 'pathname'
 
 class TestControllerWithExtraEtags < ActionController::Base
   etag { nil  }
@@ -10,20 +9,25 @@ class TestControllerWithExtraEtags < ActionController::Base
   etag { nil  }
 
   def fresh
-    render text: "stale" if stale?(etag: '123', template: false)
+    render plain: "stale" if stale?(etag: '123', template: false)
   end
 
   def array
-    render text: "stale" if stale?(etag: %w(1 2 3), template: false)
+    render plain: "stale" if stale?(etag: %w(1 2 3), template: false)
   end
 
   def with_template
     if stale? template: 'test/hello_world'
-      render text: 'stale'
+      render plain: 'stale'
     end
   end
 end
 
+class ImplicitRenderTestController < ActionController::Base
+  def empty_action
+  end
+end
+
 class TestController < ActionController::Base
   protect_from_forgery
 
@@ -120,6 +124,10 @@ class TestController < ActionController::Base
     render :action => 'hello_world'
   end
 
+  def respond_with_empty_body
+    render nothing: true
+  end
+
   def conditional_hello_with_bangs
     render :action => 'hello_world'
   end
@@ -129,6 +137,14 @@ class TestController < ActionController::Base
     fresh_when(:last_modified => Time.now.utc.beginning_of_day, :etag => [ :foo, 123 ])
   end
 
+  def head_with_status_hash
+    head status: :created
+  end
+
+  def head_with_hash_does_not_include_status
+    head warning: :deprecated
+  end
+
   def head_created
     head :created
   end
@@ -142,31 +158,31 @@ class TestController < ActionController::Base
   end
 
   def head_with_location_header
-    head :location => "/foo"
+    head :ok, :location => "/foo"
   end
 
   def head_with_location_object
-    head :location => Customer.new("david", 1)
+    head :ok, :location => Customer.new("david", 1)
   end
 
   def head_with_symbolic_status
-    head :status => params[:status].intern
+    head params[:status].intern
   end
 
   def head_with_integer_status
-    head :status => params[:status].to_i
+    head params[:status].to_i
   end
 
   def head_with_string_status
-    head :status => params[:status]
+    head params[:status]
   end
 
   def head_with_custom_header
-    head :x_custom_header => "something"
+    head :ok, :x_custom_header => "something"
   end
 
   def head_with_www_authenticate_header
-    head 'WWW-Authenticate' => 'something'
+    head :ok, 'WWW-Authenticate' => 'something'
   end
 
   def head_with_status_code_first
@@ -218,8 +234,6 @@ class MetalTestController < ActionController::Metal
   include AbstractController::Rendering
   include ActionView::Rendering
   include ActionController::Rendering
-  include ActionController::RackDelegation
-
 
   def accessing_logger_in_template
     render :inline =>  "<%= logger.class %>"
@@ -270,11 +284,18 @@ class ExpiresInRenderTest < ActionController::TestCase
     assert_match(/no-transform/, @response.headers["Cache-Control"])
   end
 
+  def test_render_nothing_deprecated
+    assert_deprecated do
+      get :respond_with_empty_body
+    end
+  end
+
   def test_date_header_when_expires_in
     time = Time.mktime(2011,10,30)
-    Time.stubs(:now).returns(time)
-    get :conditional_hello_with_expires_in
-    assert_equal Time.now.httpdate, @response.headers["Date"]
+    Time.stub :now, time do
+      get :conditional_hello_with_expires_in
+      assert_equal Time.now.httpdate, @response.headers["Date"]
+    end
   end
 end
 
@@ -453,6 +474,15 @@ class MetalRenderTest < ActionController::TestCase
   end
 end
 
+class ImplicitRenderTest < ActionController::TestCase
+  tests ImplicitRenderTestController
+
+  def test_implicit_no_content_response
+    get :empty_action
+    assert_response :no_content
+  end
+end
+
 class HeadRenderTest < ActionController::TestCase
   tests TestController
 
@@ -466,6 +496,19 @@ class HeadRenderTest < ActionController::TestCase
     assert_response :created
   end
 
+  def test_passing_hash_to_head_as_first_parameter_deprecated
+    assert_deprecated do
+      get :head_with_status_hash
+    end
+  end
+
+  def test_head_with_default_value_is_deprecated
+    assert_deprecated do
+      get :head_with_hash_does_not_include_status
+      assert_response :ok
+    end
+  end
+
   def test_head_created_with_application_json_content_type
     post :head_created_with_application_json_content_type
     assert @response.body.blank?
@@ -577,7 +620,7 @@ class HttpCacheForeverTest < ActionController::TestCase
   class HttpCacheForeverController < ActionController::Base
     def cache_me_forever
       http_cache_forever(public: params[:public], version: params[:version] || 'v1') do
-        render text: 'hello'
+        render plain: 'hello'
       end
     end
   end
@@ -586,13 +629,13 @@ class HttpCacheForeverTest < ActionController::TestCase
 
   def test_cache_with_public
     get :cache_me_forever, params: {public: true}
-    assert_equal "max-age=#{100.years.to_i}, public", @response.headers["Cache-Control"]
+    assert_equal "max-age=#{100.years}, public", @response.headers["Cache-Control"]
     assert_not_nil @response.etag
   end
 
   def test_cache_with_private
     get :cache_me_forever
-    assert_equal "max-age=#{100.years.to_i}, private", @response.headers["Cache-Control"]
+    assert_equal "max-age=#{100.years}, private", @response.headers["Cache-Control"]
     assert_not_nil @response.etag
     assert_response :success
   end