aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2005-07-04 15:36:22 +0000
committerJamis Buck <jamis@37signals.com>2005-07-04 15:36:22 +0000
commit6e7e552b039c66d1ad5251651d01e0ea097163c5 (patch)
tree0fe0b3f4d994f81d2e7f56de6a847504c82b4fd1 /actionpack/test
parentfcdcd9b9fa2f6fe37d2481b1b201fd24bf5b37c6 (diff)
downloadrails-6e7e552b039c66d1ad5251651d01e0ea097163c5.tar.gz
rails-6e7e552b039c66d1ad5251651d01e0ea097163c5.tar.bz2
rails-6e7e552b039c66d1ad5251651d01e0ea097163c5.zip
Fix broken capture test
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1665 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/capture_test.rb4
-rw-r--r--actionpack/test/fixtures/test/update_element_with_capture.rhtml6
2 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb
index ad243c4587..a48baaeda1 100644
--- a/actionpack/test/controller/capture_test.rb
+++ b/actionpack/test/controller/capture_test.rb
@@ -31,8 +31,8 @@ class CaptureTest < Test::Unit::TestCase
def test_update_element_with_capture
get :update_element_with_capture
assert_equal(
- "<script type=\"text/javascript\">$('products').innerHTML = '\\n <p>Product 1</p>\\n <p>Product 2</p>\\n'</script>" +
- "\n\n$('status').innerHTML = '\\n <b>You bought something!</b>\\n'",
+ "<script type=\"text/javascript\">$('products').innerHTML = '\\n <p>Product 1</p>\\n <p>Product 2</p>\\n';\n</script>" +
+ "\n\n$('status').innerHTML = '\\n <b>You bought something!</b>\\n';",
@response.body.strip
)
end
diff --git a/actionpack/test/fixtures/test/update_element_with_capture.rhtml b/actionpack/test/fixtures/test/update_element_with_capture.rhtml
index 2d2ac84214..fa3ef200f9 100644
--- a/actionpack/test/fixtures/test/update_element_with_capture.rhtml
+++ b/actionpack/test/fixtures/test/update_element_with_capture.rhtml
@@ -1,9 +1,9 @@
-<% replacement_function = update_element_function("products", :action => :replace) do %>
+<% replacement_function = update_element_function("products", :action => :update) do %>
<p>Product 1</p>
<p>Product 2</p>
<% end %>
<%= javascript_tag(replacement_function) %>
-<% update_element_function("status", :action => :replace, :binding => binding) do %>
+<% update_element_function("status", :action => :update, :binding => binding) do %>
<b>You bought something!</b>
-<% end %> \ No newline at end of file
+<% end %>