Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge [5501] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5502 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit f7c94e977bb92cb0148a540369fcd48fa22f15af 1 parent 69ada0e
@jeremy jeremy authored
Showing with 12 additions and 10 deletions.
  1. +12 −10 actionpack/test/controller/capture_test.rb
View
22 actionpack/test/controller/capture_test.rb
@@ -7,15 +7,15 @@ def self.controller_path; "test"; end
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 @@ def test_simple_capture
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!"
Please sign in to comment.
Something went wrong with that request. Please try again.