aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-06-21 05:22:32 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-06-21 05:22:32 -0700
commite769559a93d8cb379ff08ce36c72535671340fb2 (patch)
tree759ce5017230d586beb9affa713ef0f0a12077bf
parent26a4e5e60e4875e77a91fee5a9655d54f3635972 (diff)
parent6f6111e089407d46a634a6a6c863b04682813401 (diff)
downloadrails-e769559a93d8cb379ff08ce36c72535671340fb2.tar.gz
rails-e769559a93d8cb379ff08ce36c72535671340fb2.tar.bz2
rails-e769559a93d8cb379ff08ce36c72535671340fb2.zip
Merge pull request #6808 from arunagw/warning_removed_actionpack
Removed warnings.
-rw-r--r--actionpack/test/controller/render_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 4a795de5a2..6bebe7e1ed 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -1526,10 +1526,10 @@ class ExpiresInRenderTest < ActionController::TestCase
assert_equal "no-cache", @response.headers["Cache-Control"]
end
- def test_expires_now
+ def test_expires_now_with_cache_control_headers
get :conditional_hello_with_cache_control_headers
- assert_match /no-cache/, @response.headers["Cache-Control"]
- assert_match /no-transform/, @response.headers["Cache-Control"]
+ assert_match(/no-cache/, @response.headers["Cache-Control"])
+ assert_match(/no-transform/, @response.headers["Cache-Control"])
end
def test_date_header_when_expires_in