1 files changed, 29 insertions, 2 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 0e5bad7482..98b34a872b 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -32,6 +32,10 @@ class TestControllerWithExtraEtags < ActionController::Base
   def fresh
     render text: "stale" if stale?(etag: '123')
   end
+
+  def array
+    render text: "stale" if stale?(etag: %w(1 2 3))
+  end
 end
 
 class TestController < ActionController::Base
@@ -771,6 +775,10 @@ class RenderTest < ActionController::TestCase
     @request.host = "www.nextangle.com"
   end
 
+  def teardown
+    ActionView::Base.logger = nil
+  end
+
   # :ported:
   def test_simple_show
     get :hello_world
@@ -1085,6 +1093,12 @@ class RenderTest < ActionController::TestCase
     assert_equal '<test>passed formatted html erb</test>', @response.body
   end
 
+  def test_should_render_formatted_html_erb_template_with_bad_accepts_header
+    @request.env["HTTP_ACCEPT"] = "; a=dsf"
+    get :formatted_xml_erb
+    assert_equal '<test>passed formatted html erb</test>', @response.body
+  end
+
   def test_should_render_formatted_html_erb_template_with_faulty_accepts_header
     @request.accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, appliction/x-shockwave-flash, */*"
     get :formatted_xml_erb
@@ -1649,7 +1663,6 @@ class LastModifiedRenderTest < ActionController::TestCase
     assert_equal @last_modified, @response.headers['Last-Modified']
   end
 
-
   def test_request_with_bang_gets_last_modified
     get :conditional_hello_with_bangs
     assert_equal @last_modified, @response.headers['Last-Modified']
@@ -1678,7 +1691,7 @@ class EtagRenderTest < ActionController::TestCase
   end
 
   def test_multiple_etags
-    @request.if_none_match = %("#{Digest::MD5.hexdigest(ActiveSupport::Cache.expand_cache_key([ "123", 'ab', :cde, [:f] ]))}")
+    @request.if_none_match = etag(["123", 'ab', :cde, [:f]])
     get :fresh
     assert_response :not_modified
 
@@ -1686,6 +1699,20 @@ class EtagRenderTest < ActionController::TestCase
     get :fresh
     assert_response :success
   end
+
+  def test_array
+    @request.if_none_match = etag([%w(1 2 3), 'ab', :cde, [:f]])
+    get :array
+    assert_response :not_modified
+
+    @request.if_none_match = %("nomatch")
+    get :array
+    assert_response :success
+  end
+
+  def etag(record)
+    Digest::MD5.hexdigest(ActiveSupport::Cache.expand_cache_key(record)).inspect
+  end
 end