diff options
| author | David Heinemeier Hansson <david@envy8.local> | 2008-04-28 13:29:23 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@envy8.local> | 2008-04-28 13:29:23 -0500 |
| commit | 9a80e97d58610895d62bfc158ede4c4358582819 (patch) | |
| tree | 3553e3fb178e24f8971f8c7ec3e87b34b620a687 /actionpack/lib/action_controller/assertions | |
| parent | 0a6980f2dc6ef8b211323e0655f41702a4ce3eae (diff) | |
| parent | 642bcd2d011ce8c32a0a69bfb4fd6942593584bb (diff) | |
| download | rails-9a80e97d58610895d62bfc158ede4c4358582819.tar.gz rails-9a80e97d58610895d62bfc158ede4c4358582819.tar.bz2 rails-9a80e97d58610895d62bfc158ede4c4358582819.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/assertions')
| -rw-r--r-- | actionpack/lib/action_controller/assertions/selector_assertions.rb | 5 |
1 files changed, 4 insertions, 1 deletions
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) |