kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Moved html_document to ActionDispatch::Assertions. Included the Rails::Dom::Testing::Assertions there as well.

Browse source
This commit is contained in:
Timm 2013-10-12 22:58:51 +02:00
parent 50347b15fe
commit 9efdffe437
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
actionpack/lib/action_controller/test_case.rb
View file

@ -684,14 +684,9 @@ module ActionController
private private
def document_root_element def document_root_element
@html_document ||= if @response.content_type =~ /xml$/ html_document.root
Loofah.xml_document(@response.body)
else
Loofah.document(@response.body)
end.root
end end
def check_required_ivars def check_required_ivars
# Sanity check for required instance variables so we can give an # Sanity check for required instance variables so we can give an
# understandable error message. # understandable error message.

13
actionpack/lib/action_dispatch/testing/assertions.rb
View file

@ -1,3 +1,6 @@
require 'loofah'
require 'rails-dom-testing'
module ActionDispatch module ActionDispatch
module Assertions module Assertions
autoload :ResponseAssertions, 'action_dispatch/testing/assertions/response' autoload :ResponseAssertions, 'action_dispatch/testing/assertions/response'
@ -7,6 +10,14 @@ module ActionDispatch
include ResponseAssertions include ResponseAssertions
include RoutingAssertions 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
end end