aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-09-29 16:50:46 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-09-29 16:50:46 -0300
commitf93df52845766216f0fe36a4586f8abad505cac4 (patch)
treec2578b2bf372d8da275eee65a746a0c19434fb36 /actionpack/lib
parenta455e3f4e9dbfb9630d47878e1239bc424fb7d13 (diff)
parentf939904f23a792f5923b5ed683cbbc54a05ad1fe (diff)
downloadrails-f93df52845766216f0fe36a4586f8abad505cac4.tar.gz
rails-f93df52845766216f0fe36a4586f8abad505cac4.tar.bz2
rails-f93df52845766216f0fe36a4586f8abad505cac4.zip
Merge pull request #17107 from kaspth/parse-html-as-fragments
Parse HTML as document fragment.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/test_case.rb2
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions.rb2
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 8c10c3e7b0..41d33d4396 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -689,7 +689,7 @@ module ActionController
private
def document_root_element
- html_document.root
+ html_document
end
def check_required_ivars
diff --git a/actionpack/lib/action_dispatch/testing/assertions.rb b/actionpack/lib/action_dispatch/testing/assertions.rb
index f325c35b57..41d00b5e2b 100644
--- a/actionpack/lib/action_dispatch/testing/assertions.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions.rb
@@ -15,7 +15,7 @@ module ActionDispatch
@html_document ||= if @response.content_type =~ /xml$/
Nokogiri::XML::Document.parse(@response.body)
else
- Nokogiri::HTML::Document.parse(@response.body)
+ Nokogiri::HTML::DocumentFragment.parse(@response.body)
end
end
end
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 2d1c3ac5c7..c300a4ea0d 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -497,7 +497,7 @@ module ActionDispatch
end
def document_root_element
- html_document.root
+ html_document
end
end
end