diff options
author | twinturbo <me@broadcastingadam.com> | 2012-04-28 22:33:11 -0700 |
---|---|---|
committer | twinturbo <me@broadcastingadam.com> | 2012-04-28 22:33:11 -0700 |
commit | d7532c189f26e008fc6ef50336ed5e8168b8221c (patch) | |
tree | 681436aa5d80ed5e4c9a867ccc891eab6852f124 /actionpack/lib/action_dispatch/testing/assertions/selector.rb | |
parent | 2c136ae0543ea53dcb3a3ef9372b216b54d66172 (diff) | |
parent | 6659252d9f0e6d77bee268adf587e03cfeb8f9ad (diff) | |
download | rails-d7532c189f26e008fc6ef50336ed5e8168b8221c.tar.gz rails-d7532c189f26e008fc6ef50336ed5e8168b8221c.tar.bz2 rails-d7532c189f26e008fc6ef50336ed5e8168b8221c.zip |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions/selector.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/selector.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb index 8eed85bce2..ea1ed20f3c 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb @@ -269,6 +269,7 @@ module ActionDispatch end end text.strip! unless NO_STRIP.include?(match.name) + text.sub!(/\A\n/, '') if match.name == "textarea" unless match_with.is_a?(Regexp) ? (text =~ match_with) : (text == match_with.to_s) content_mismatch ||= sprintf("<%s> expected but was\n<%s>.", match_with, text) true |