aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-05-02 14:23:44 -0500
committerJoshua Peek <josh@joshpeek.com>2009-05-02 14:23:44 -0500
commit3900f4007ee6463b8936af23c04017a900673866 (patch)
tree216e69d5b5426702fe7009f3203ee897e5f92bc2 /actionpack/test/controller
parent3be3470fab788856b4559742434f195cc6b1009a (diff)
downloadrails-3900f4007ee6463b8936af23c04017a900673866.tar.gz
rails-3900f4007ee6463b8936af23c04017a900673866.tar.bz2
rails-3900f4007ee6463b8936af23c04017a900673866.zip
Deprecate assert_redirect_to's partial hash matching
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/action_pack_assertions_test.rb8
-rw-r--r--actionpack/test/controller/redirect_test.rb6
2 files changed, 9 insertions, 5 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 711640f9a9..60957a2f0e 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -514,9 +514,11 @@ class ActionPackHeaderTest < ActionController::TestCase
end
def test_rendering_xml_respects_content_type
- @response.headers['type'] = 'application/pdf'
- process :hello_xml_world
- assert_equal('application/pdf; charset=utf-8', @response.headers['Content-Type'])
+ pending do
+ @response.headers['type'] = 'application/pdf'
+ process :hello_xml_world
+ assert_equal('application/pdf; charset=utf-8', @response.headers['Content-Type'])
+ end
end
def test_render_text_with_custom_content_type
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index 91e21db854..9ad63a1c60 100644
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -234,8 +234,10 @@ class RedirectTest < ActionController::TestCase
end
def test_redirect_with_partial_params
- get :module_redirect
- assert_redirected_to :action => 'hello_world'
+ pending do
+ get :module_redirect
+ assert_redirected_to :action => 'hello_world'
+ end
end
def test_redirect_to_nil