2 files changed, 6 insertions, 8 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index a2d639cd56..7381617dd7 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -55,16 +55,14 @@ module ActionDispatch
       #   assert_redirected_to @customer
       #
       def assert_redirected_to(options = {}, message=nil)
-        validate_request!
-
         assert_response(:redirect, message)
         return true if options == @response.location
 
-        redirected_to_after_normalization = normalize_argument_to_redirection(@response.location)
-        options_after_normalization       = normalize_argument_to_redirection(options)
+        redirect_is       = normalize_argument_to_redirection(@response.location)
+        redirect_expected = normalize_argument_to_redirection(options)
 
-        if redirected_to_after_normalization != options_after_normalization
-          flunk "Expected response to be a redirect to <#{options_after_normalization}> but was a redirect to <#{redirected_to_after_normalization}>"
+        if redirect_is != redirect_expected
+          flunk "Expected response to be a redirect to <#{redirect_expected}> but was a redirect to <#{redirect_is}>"
         end
       end
 
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