diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-03-18 01:57:01 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-03-18 01:57:01 -0300 |
| commit | 29b539c7251589d13a0b27c41fe551fea1546448 (patch) | |
| tree | d39fd0b3299f4c69aae37ed7589ce004e2186b0e /actionpack/lib/action_dispatch | |
| parent | a42c9528d8556425681952f42269699bcbe0422f (diff) | |
| parent | 4be3997c9f317e4295421d31204a31962206b55c (diff) | |
| download | rails-29b539c7251589d13a0b27c41fe551fea1546448.tar.gz rails-29b539c7251589d13a0b27c41fe551fea1546448.tar.bz2 rails-29b539c7251589d13a0b27c41fe551fea1546448.zip | |
Merge pull request #19351 from reist/xml_document
Compare content_type with Mime::XML instead of regexp
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions.rb b/actionpack/lib/action_dispatch/testing/assertions.rb index f325c35b57..21b3b89d22 100644 --- a/actionpack/lib/action_dispatch/testing/assertions.rb +++ b/actionpack/lib/action_dispatch/testing/assertions.rb @@ -12,7 +12,7 @@ module ActionDispatch include Rails::Dom::Testing::Assertions def html_document - @html_document ||= if @response.content_type =~ /xml$/ + @html_document ||= if @response.content_type === Mime::XML Nokogiri::XML::Document.parse(@response.body) else Nokogiri::HTML::Document.parse(@response.body) |