aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing/assertions
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-06-07 17:00:09 -0400
committerwycats <wycats@gmail.com>2010-06-07 18:06:08 -0400
commitd6953cbfd3b6e06eceba715c60e288b6d7db0d49 (patch)
tree0e54acc2ae35e985cd8c8175f051e281acbd4595 /actionpack/lib/action_dispatch/testing/assertions
parenta210aff210616922063c89680219bb45581cc217 (diff)
downloadrails-d6953cbfd3b6e06eceba715c60e288b6d7db0d49.tar.gz
rails-d6953cbfd3b6e06eceba715c60e288b6d7db0d49.tar.bz2
rails-d6953cbfd3b6e06eceba715c60e288b6d7db0d49.zip
regular expressions are usually ASCII-encoded, so force_encoding the content of a Node to the encoding of the regular expression is wrong.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions')
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/selector.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index 9deabf5b3c..0e82b41590 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -267,14 +267,12 @@ module ActionDispatch
if match_with = equals[:text]
matches.delete_if do |match|
text = ""
- text.force_encoding(match_with.encoding) if text.respond_to?(:force_encoding)
stack = match.children.reverse
while node = stack.pop
if node.tag?
stack.concat node.children.reverse
else
content = node.content
- content.force_encoding(match_with.encoding) if content.respond_to?(:force_encoding)
text << content
end
end