aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-11-13 00:53:20 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-11-13 00:53:20 +0000
commitafe49dcf5b0219afd989aaeb1ff6fc9ab6b70a43 (patch)
tree3fbfe3a591f2a1b61bd80168456fa5757dc382a8 /actionpack/test
parentc192bdfc74777f3a86f2f9b54459259330424cf5 (diff)
downloadrails-afe49dcf5b0219afd989aaeb1ff6fc9ab6b70a43.tar.gz
rails-afe49dcf5b0219afd989aaeb1ff6fc9ab6b70a43.tar.bz2
rails-afe49dcf5b0219afd989aaeb1ff6fc9ab6b70a43.zip
update_element_function is deprecated
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5501 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/capture_test.rb22
1 files changed, 12 insertions, 10 deletions
diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb
index e4f76a4dbf..43bf346eef 100644
--- a/actionpack/test/controller/capture_test.rb
+++ b/actionpack/test/controller/capture_test.rb
@@ -7,15 +7,15 @@ class CaptureController < ActionController::Base
def content_for
render :layout => "talk_from_action"
end
-
+
def erb_content_for
render :layout => "talk_from_action"
end
-
+
def block_content_for
render :layout => "talk_from_action"
end
-
+
def non_erb_block_content_for
render :layout => "talk_from_action"
end
@@ -43,36 +43,38 @@ class CaptureTest < Test::Unit::TestCase
get :capturing
assert_equal "Dreamy days", @response.body.strip
end
-
+
def test_content_for
get :content_for
assert_equal expected_content_for_output, @response.body
end
-
+
def test_erb_content_for
get :content_for
assert_equal expected_content_for_output, @response.body
end
-
+
def test_block_content_for
get :block_content_for
assert_equal expected_content_for_output, @response.body
end
-
+
def test_non_erb_block_content_for
get :non_erb_block_content_for
assert_equal expected_content_for_output, @response.body
end
def test_update_element_with_capture
- get :update_element_with_capture
+ assert_deprecated 'update_element_function' do
+ get :update_element_with_capture
+ end
assert_equal(
"<script type=\"text/javascript\">\n//<![CDATA[\n$('products').innerHTML = '\\n <p>Product 1</p>\\n <p>Product 2</p>\\n';\n\n//]]>\n</script>" +
- "\n\n$('status').innerHTML = '\\n <b>You bought something!</b>\\n';",
+ "\n\n$('status').innerHTML = '\\n <b>You bought something!</b>\\n';",
@response.body.strip
)
end
-
+
private
def expected_content_for_output
"<title>Putting stuff in the title!</title>\n\nGreat stuff!"