aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAnuj Dutta <anuj@andhapp.com>2012-03-02 10:40:57 +0000
committerAnuj Dutta <anuj@andhapp.com>2012-03-10 15:10:50 +0000
commit7d2bbb6ca4d5c3edd576def3f042e6c39549bb57 (patch)
tree44b52c4c176b325bb7ced9cc7e6fb29b378072bb /actionpack
parent9078dba7de7e703f1558b03502791b16225d18eb (diff)
downloadrails-7d2bbb6ca4d5c3edd576def3f042e6c39549bb57.tar.gz
rails-7d2bbb6ca4d5c3edd576def3f042e6c39549bb57.tar.bz2
rails-7d2bbb6ca4d5c3edd576def3f042e6c39549bb57.zip
Removed max-stale from the tests since it's a request cache-control directive, just for clarity sake.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/render_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index e040878b26..582106a328 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -102,12 +102,12 @@ class TestController < ActionController::Base
end
def conditional_hello_with_expires_in_with_public_with_more_keys
- expires_in 1.minute, :public => true, 'max-stale' => 5.hours
+ expires_in 1.minute, :public => true, 's-maxage' => 5.hours
render :action => 'hello_world'
end
def conditional_hello_with_expires_in_with_public_with_more_keys_old_syntax
- expires_in 1.minute, :public => true, :private => nil, 'max-stale' => 5.hours
+ expires_in 1.minute, :public => true, :private => nil, 's-maxage' => 5.hours
render :action => 'hello_world'
end
@@ -1421,12 +1421,12 @@ class ExpiresInRenderTest < ActionController::TestCase
def test_expires_in_header_with_additional_headers
get :conditional_hello_with_expires_in_with_public_with_more_keys
- assert_equal "max-age=60, public, max-stale=18000", @response.headers["Cache-Control"]
+ assert_equal "max-age=60, public, s-maxage=18000", @response.headers["Cache-Control"]
end
def test_expires_in_old_syntax
get :conditional_hello_with_expires_in_with_public_with_more_keys_old_syntax
- assert_equal "max-age=60, public, max-stale=18000", @response.headers["Cache-Control"]
+ assert_equal "max-age=60, public, s-maxage=18000", @response.headers["Cache-Control"]
end
def test_expires_now