aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/render_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-24 15:40:08 -0700
committerJosé Valim <jose.valim@gmail.com>2011-05-24 15:40:08 -0700
commit6f413d87b24a0dc5ec741d1190dc3023cd2fcfdb (patch)
tree6429a04b626d73cfa5d6779290390cd0040cec71 /actionpack/test/controller/render_test.rb
parentce37f747cd37a480025fbe69c3b1e44cb6a6e3af (diff)
parentd182b6ee9c99901553e6e948f91102d03bb041b0 (diff)
downloadrails-6f413d87b24a0dc5ec741d1190dc3023cd2fcfdb.tar.gz
rails-6f413d87b24a0dc5ec741d1190dc3023cd2fcfdb.tar.bz2
rails-6f413d87b24a0dc5ec741d1190dc3023cd2fcfdb.zip
Merge pull request #1281 from joshk/removed_action_pack_deprecations
removed deprecated methods, and related tests, from ActionPack
Diffstat (limited to 'actionpack/test/controller/render_test.rb')
-rw-r--r--actionpack/test/controller/render_test.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index e62f3155c5..be59da9105 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -1023,11 +1023,6 @@ class RenderTest < ActionController::TestCase
assert_equal " ", @response.body
end
- def test_render_to_string_not_deprecated
- assert_not_deprecated { get :hello_in_a_string }
- assert_equal "How's there? goodbyeHello: davidHello: marygoodbye\n", @response.body
- end
-
def test_render_to_string_doesnt_break_assigns
get :render_to_string_with_assigns
assert_equal "i'm before the render", assigns(:before)
@@ -1106,7 +1101,7 @@ class RenderTest < ActionController::TestCase
end
def test_yield_content_for
- assert_not_deprecated { get :yield_content_for }
+ get :yield_content_for
assert_equal "<title>Putting stuff in the title!</title>\nGreat stuff!\n", @response.body
end