aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing/assertions/selector.rb
diff options
context:
space:
mode:
authorTimm <kaspth@gmail.com>2013-07-23 19:31:24 +0200
committerTimm <kaspth@gmail.com>2014-06-15 23:41:07 +0200
commit63fc9f1f4f42c962c59ef9068d8542552ce0f887 (patch)
tree7172ae48a33e5c7a1d871f7a25eb62cd99b728be /actionpack/lib/action_dispatch/testing/assertions/selector.rb
parentab3a236b9d8a8e3eb575972d1ff9192179870011 (diff)
downloadrails-63fc9f1f4f42c962c59ef9068d8542552ce0f887.tar.gz
rails-63fc9f1f4f42c962c59ef9068d8542552ce0f887.tar.bz2
rails-63fc9f1f4f42c962c59ef9068d8542552ce0f887.zip
Readded html_document method since it is used integration tests.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions/selector.rb')
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/selector.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index ff7b611228..5045197415 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -329,12 +329,16 @@ module ActionDispatch
end
def response_from_page
+ html_document.root
+ end
+
+ # +html_document+ is used in testing/integration.rb
+ def html_document
@html_document ||= if @response.content_type =~ /xml$/
Loofah.xml_document(@response.body)
else
Loofah.document(@response.body)
end
- @html_document.root
end
class ArgumentFilter #:nodoc: