aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/test_case.rb
diff options
context:
space:
mode:
authorTimm <kaspth@gmail.com>2013-10-11 23:29:08 +0200
committerTimm <kaspth@gmail.com>2014-06-16 21:04:19 +0200
commit83f1563ee6cae34447b4ed12f8cf39cc15177a38 (patch)
tree661239e9dd9dc95fb9d662b87d905ac329c8767c /actionview/lib/action_view/test_case.rb
parent28fd5ebd2e6b46ba7f2b7b138124d240245417e8 (diff)
downloadrails-83f1563ee6cae34447b4ed12f8cf39cc15177a38.tar.gz
rails-83f1563ee6cae34447b4ed12f8cf39cc15177a38.tar.bz2
rails-83f1563ee6cae34447b4ed12f8cf39cc15177a38.zip
Support for changes in SelectorAssertions.
Diffstat (limited to 'actionview/lib/action_view/test_case.rb')
-rw-r--r--actionview/lib/action_view/test_case.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/actionview/lib/action_view/test_case.rb b/actionview/lib/action_view/test_case.rb
index ce1f763015..337fa0e840 100644
--- a/actionview/lib/action_view/test_case.rb
+++ b/actionview/lib/action_view/test_case.rb
@@ -3,6 +3,7 @@ require 'action_controller'
require 'action_controller/test_case'
require 'action_view'
+require 'loofah'
require 'rails-dom-testing'
module ActionView
@@ -154,11 +155,10 @@ module ActionView
private
- # Support the selector assertions
- #
# Need to experiment if this priority is the best one: rendered => output_buffer
- def response_from_page
- Loofah.document(@rendered.blank? ? @output_buffer : @rendered).root
+ def document_root_element
+ @html_document ||= Loofah.document(@rendered.blank? ? @output_buffer : @rendered)
+ @html_document.root
end
def say_no_to_protect_against_forgery!
@@ -239,7 +239,8 @@ module ActionView
:@test_passed,
:@view,
:@view_context_class,
- :@_subscribers
+ :@_subscribers,
+ :@html_document
]
def _user_defined_ivars