aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorArun Agrawal <arunagw@gmail.com>2012-06-21 17:00:19 +0530
committerArun Agrawal <arunagw@gmail.com>2012-06-21 17:01:57 +0530
commit6f6111e089407d46a634a6a6c863b04682813401 (patch)
tree759ce5017230d586beb9affa713ef0f0a12077bf /actionpack
parent26a4e5e60e4875e77a91fee5a9655d54f3635972 (diff)
downloadrails-6f6111e089407d46a634a6a6c863b04682813401.tar.gz
rails-6f6111e089407d46a634a6a6c863b04682813401.tar.bz2
rails-6f6111e089407d46a634a6a6c863b04682813401.zip
Removed warnings.
1. Change in test name as already defined. 2. ambiguous first argument; put parentheses or even spaces
Diffstat (limited to 'actionpack')
-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