Permalink
Browse files

Merge pull request #5368 from andhapp/remove-max-stale

Minor test improvement
  • Loading branch information...
2 parents c35df12 + 7d2bbb6 commit fef110d4a8ada2663c52467b9c1b1dd34ddc4bd6 @josevalim josevalim committed May 7, 2012
Showing with 4 additions and 4 deletions.
  1. +4 −4 actionpack/test/controller/render_test.rb
@@ -102,12 +102,12 @@ def conditional_hello_with_expires_in_with_public_and_must_revalidate
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
@@ -1478,12 +1478,12 @@ def test_expires_in_header_with_public_and_must_revalidate
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

0 comments on commit fef110d

Please sign in to comment.