diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-10-22 13:51:54 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-10-22 13:51:54 -0200 |
commit | 2828cfd137416b963f766ff1bda7a2c879e80f9e (patch) | |
tree | c77aae395e600f0db3c4da7e16cc9c358747090d /actionpack/lib/action_dispatch/testing/assertions.rb | |
parent | 279012c76cb54ddc73a0f36888179b2ac90de54e (diff) | |
parent | 36005af64a0c233e7391688296b183acb73dc0c0 (diff) | |
download | rails-2828cfd137416b963f766ff1bda7a2c879e80f9e.tar.gz rails-2828cfd137416b963f766ff1bda7a2c879e80f9e.tar.bz2 rails-2828cfd137416b963f766ff1bda7a2c879e80f9e.zip |
Merge pull request #22029 from yui-knk/fixup_content_type_regexp
Use sufficient a regexp anchor to check `@response.content_type.to_s`
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions.rb')
-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 715d94d406..fae266273e 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.to_s =~ /xml$/ + @html_document ||= if @response.content_type.to_s =~ /xml\z/ Nokogiri::XML::Document.parse(@response.body) else Nokogiri::HTML::Document.parse(@response.body) |