aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing
diff options
context:
space:
mode:
authorTimm <kaspth@gmail.com>2013-07-30 12:04:37 +0200
committerTimm <kaspth@gmail.com>2014-06-16 21:03:57 +0200
commit4ed784188d329315c79916242a5961c3c128b06c (patch)
tree6c4d49613a2cd306169e8a8b7a154a3a637eb15a /actionpack/lib/action_dispatch/testing
parent7e7e19132d2206831b824039a362aa378a4ef70e (diff)
downloadrails-4ed784188d329315c79916242a5961c3c128b06c.tar.gz
rails-4ed784188d329315c79916242a5961c3c128b06c.tar.bz2
rails-4ed784188d329315c79916242a5961c3c128b06c.zip
Fixed: now only compares html of children in filter_matches.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/selector.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index 9b03ccce14..dc18136be2 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -297,7 +297,7 @@ module ActionDispatch
text_matches = options.has_key?(:text)
remaining = matches.reject do |match|
# Preserve markup with to_s for html elements
- content = text_matches ? match.text : match.to_s
+ content = text_matches ? match.text : match.children.to_s
content.strip! unless NO_STRIP.include?(match.name)
content.sub!(/\A\n/, '') if text_matches && match.name == "textarea"