From 642bcd2d011ce8c32a0a69bfb4fd6942593584bb Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 27 Apr 2008 17:52:35 -0700 Subject: Ruby 1.9 compat: force assert_select text encoding to the encoding of the regexp it's matching against. --- actionpack/lib/action_controller/assertions/selector_assertions.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/assertions/selector_assertions.rb') diff --git a/actionpack/lib/action_controller/assertions/selector_assertions.rb b/actionpack/lib/action_controller/assertions/selector_assertions.rb index 573405c0f9..272b8f6841 100644 --- a/actionpack/lib/action_controller/assertions/selector_assertions.rb +++ b/actionpack/lib/action_controller/assertions/selector_assertions.rb @@ -263,12 +263,15 @@ module ActionController 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 - text << node.content + content = node.content + content.force_encoding(match_with.encoding) if content.respond_to?(:force_encoding) + text << content end end text.strip! unless NO_STRIP.include?(match.name) -- cgit v1.2.3