aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorSam Stephenson <sam@37signals.com>2006-09-20 20:14:12 +0000
committerSam Stephenson <sam@37signals.com>2006-09-20 20:14:12 +0000
commit236cf90bf16c93a112d1b6ca8ece47ba41802058 (patch)
treed8541f2ffe2b19a3714459c9849210d81d094ca0 /actionpack
parentd137281d2560af134c726af36a8c7f0491a0b4a0 (diff)
downloadrails-236cf90bf16c93a112d1b6ca8ece47ba41802058.tar.gz
rails-236cf90bf16c93a112d1b6ca8ece47ba41802058.tar.bz2
rails-236cf90bf16c93a112d1b6ca8ece47ba41802058.zip
Update RJS render tests.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5155 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/test/controller/new_render_test.rb6
2 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 54fc1e72b8..fb03e5b505 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Update RJS render tests. [sam]
+
* Update CGI process to allow sessions to contain namespaced models. Closes #4638. [dfelstead@site5.com]
* Fix routing to respect user provided requirements and defaults when assigning default routing options (such as :action => 'index'). Closes #5950. [Nicholas Seckar]
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index 8af6440c56..936e75d04f 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -434,17 +434,17 @@ EOS
def test_render_rjs_with_default
get :delete_with_js
- assert_equal %!["person"].each(Element.remove);\nnew Effect.Highlight(\"project-4\",{});!, @response.body
+ assert_equal %!Element.remove("person");\nnew Effect.Highlight(\"project-4\",{});!, @response.body
end
def test_render_rjs_template_explicitly
get :render_js_with_explicit_template
- assert_equal %!["person"].each(Element.remove);\nnew Effect.Highlight(\"project-4\",{});!, @response.body
+ assert_equal %!Element.remove("person");\nnew Effect.Highlight(\"project-4\",{});!, @response.body
end
def test_rendering_rjs_action_explicitly
get :render_js_with_explicit_action_template
- assert_equal %!["person"].each(Element.remove);\nnew Effect.Highlight(\"project-4\",{});!, @response.body
+ assert_equal %!Element.remove("person");\nnew Effect.Highlight(\"project-4\",{});!, @response.body
end
def test_layout_rendering