aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-04-05 16:03:36 +0200
committerXavier Noria <fxn@hashref.com>2011-04-13 13:24:33 +0200
commitacdbc6ae41c9815a77469bd320be432d6c7b9b87 (patch)
tree332ae8155dc3c4ee96d6edea72532ee555c971c1 /actionpack/lib/action_view
parent86d6cdd7f7734b4dcfd7792c0326f14b45d5af53 (diff)
downloadrails-acdbc6ae41c9815a77469bd320be432d6c7b9b87.tar.gz
rails-acdbc6ae41c9815a77469bd320be432d6c7b9b87.tar.bz2
rails-acdbc6ae41c9815a77469bd320be432d6c7b9b87.zip
renames response_from_page_or_rjs -> response_from_page, and extracts the RJS in it
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/test_case.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 3e2ddffa16..5c74bf843a 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -121,7 +121,7 @@ module ActionView
# Support the selector assertions
#
# Need to experiment if this priority is the best one: rendered => output_buffer
- def response_from_page_or_rjs
+ def response_from_page
HTML::Document.new(@rendered.blank? ? @output_buffer : @rendered).root
end