diff options
| author | Nat Welch <nat@natwelch.com> | 2011-09-21 23:53:18 -0700 |
|---|---|---|
| committer | Nat Welch <nat@natwelch.com> | 2011-09-21 23:53:18 -0700 |
| commit | 667d21814b67c615d3317488d0678cb992d3bdb1 (patch) | |
| tree | d10e68a7d904641f88e6e835074273ab0bcafbc4 /actionpack/lib/action_dispatch/testing | |
| parent | f69036781c0ee7a22a456fe3a6689277d44ed9a6 (diff) | |
| parent | 2bf33bd4bcd488a35e641b32dd667f3092ea9197 (diff) | |
| download | rails-667d21814b67c615d3317488d0678cb992d3bdb1.tar.gz rails-667d21814b67c615d3317488d0678cb992d3bdb1.tar.bz2 rails-667d21814b67c615d3317488d0678cb992d3bdb1.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/selector.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb index 5fa91d1a76..b4555f4f59 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb @@ -415,9 +415,9 @@ module ActionDispatch assert !deliveries.empty?, "No e-mail in delivery list" for delivery in deliveries - for part in delivery.parts + for part in (delivery.parts.empty? ? [delivery] : delivery.parts) if part["Content-Type"].to_s =~ /^text\/html\W/ - root = HTML::Document.new(part.body).root + root = HTML::Document.new(part.body.to_s).root assert_select root, ":root", &block end end |