From 9efdffe437ef5ac7b4416a9b7ad180b1e5888e28 Mon Sep 17 00:00:00 2001 From: Timm Date: Sat, 12 Oct 2013 22:58:51 +0200 Subject: Moved html_document to ActionDispatch::Assertions. Included the Rails::Dom::Testing::Assertions there as well. --- actionpack/lib/action_dispatch/testing/assertions.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_dispatch') diff --git a/actionpack/lib/action_dispatch/testing/assertions.rb b/actionpack/lib/action_dispatch/testing/assertions.rb index 5f923abbf9..44815a75a8 100644 --- a/actionpack/lib/action_dispatch/testing/assertions.rb +++ b/actionpack/lib/action_dispatch/testing/assertions.rb @@ -1,3 +1,6 @@ +require 'loofah' +require 'rails-dom-testing' + module ActionDispatch module Assertions autoload :ResponseAssertions, 'action_dispatch/testing/assertions/response' @@ -7,6 +10,14 @@ module ActionDispatch include ResponseAssertions include RoutingAssertions + include Rails::Dom::Testing::Assertions + + def html_document + @html_document ||= if @response.content_type =~ /xml$/ + Loofah.xml_document(@response.body) + else + Loofah.document(@response.body) + end + end end end - -- cgit v1.2.3