Upgrade to Rails 2.2.0

As a side benefit, fix an (non-user-visible) bug in display_s5().
Also fixed a bug where removing orphaned pages did not expire cached summary pages.
This commit is contained in:
Jacques Distler 2008-10-27 01:47:01 -05:00
parent 39348c65c2
commit 7600aef48b
827 changed files with 123652 additions and 11027 deletions

View file

@ -77,49 +77,64 @@ class ComponentsTest < Test::Unit::TestCase
end
def test_calling_from_controller
get :calling_from_controller
assert_equal "Lady of the House, speaking", @response.body
assert_deprecated do
get :calling_from_controller
assert_equal "Lady of the House, speaking", @response.body
end
end
def test_calling_from_controller_with_params
get :calling_from_controller_with_params
assert_equal "David of the House, speaking", @response.body
assert_deprecated do
get :calling_from_controller_with_params
assert_equal "David of the House, speaking", @response.body
end
end
def test_calling_from_controller_with_different_status_code
get :calling_from_controller_with_different_status_code
assert_equal 500, @response.response_code
assert_deprecated do
get :calling_from_controller_with_different_status_code
assert_equal 500, @response.response_code
end
end
def test_calling_from_template
get :calling_from_template
assert_equal "Ring, ring: Lady of the House, speaking", @response.body
assert_deprecated do
get :calling_from_template
assert_equal "Ring, ring: Lady of the House, speaking", @response.body
end
end
def test_etag_is_set_for_parent_template_when_calling_from_template
get :calling_from_template
expected_etag = etag_for("Ring, ring: Lady of the House, speaking")
assert_equal expected_etag, @response.headers['ETag']
assert_deprecated do
get :calling_from_template
expected_etag = etag_for("Ring, ring: Lady of the House, speaking")
assert_equal expected_etag, @response.headers['ETag']
end
end
def test_internal_calling
get :internal_caller
assert_equal "Are you there? Yes, ma'am", @response.body
assert_deprecated do
get :internal_caller
assert_equal "Are you there? Yes, ma'am", @response.body
end
end
def test_flash
get :set_flash
assert_equal 'My stoney baby', flash[:notice]
get :use_flash
assert_equal 'My stoney baby', @response.body
get :use_flash
assert_equal 'no flash', @response.body
assert_deprecated do
get :set_flash
assert_equal 'My stoney baby', flash[:notice]
get :use_flash
assert_equal 'My stoney baby', @response.body
get :use_flash
assert_equal 'no flash', @response.body
end
end
def test_component_redirect_redirects
get :calling_redirected
assert_redirected_to :action => "being_called"
assert_deprecated do
get :calling_redirected
assert_redirected_to :controller=>"callee", :action => "being_called"
end
end
def test_component_multiple_redirect_redirects
@ -128,9 +143,10 @@ class ComponentsTest < Test::Unit::TestCase
end
def test_component_as_string_redirect_renders_redirected_action
get :calling_redirected_as_string
assert_equal "Lady of the House, speaking", @response.body
assert_deprecated do
get :calling_redirected_as_string
assert_equal "Lady of the House, speaking", @response.body
end
end
protected