Fix failing tests on AM about render(:body => Hash).

2 files changed, 6 insertions, 8 deletions

diff --git a/actionmailer/lib/action_mailer/deprecated_api.rb b/actionmailer/lib/action_mailer/deprecated_api.rb
index 61101c26a1..36eec1087e 100644
--- a/actionmailer/lib/action_mailer/deprecated_api.rb
+++ b/actionmailer/lib/action_mailer/deprecated_api.rb
@@ -93,10 +93,12 @@ module ActionMailer
 
     def render(*args)
       options = args.last.is_a?(Hash) ? args.last : {}
-      if options[:body]
+
+      if options[:body].is_a?(Hash)
         ActiveSupport::Deprecation.warn(':body in render deprecated. Please use instance ' <<
                                         'variables as assigns instead', caller[0,1])
-        body options.delete(:body)
+
+        options[:body].each { |k,v| instance_variable_set(:"@#{k}", v) }
       end
       super
     end
diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb
index 22c3c518b1..4694958222 100644
--- a/actionmailer/lib/action_mailer/old_api.rb
+++ b/actionmailer/lib/action_mailer/old_api.rb
@@ -204,12 +204,8 @@ module ActionMailer
 
     def create_parts 
       if String === @body
-        self.response_body = @body
-      end
-
-      if String === response_body
-        @parts.unshift create_inline_part(response_body)
-      else
+        @parts.unshift create_inline_part(@body)
+      elsif @parts.empty? || @parts.all? { |p| p.content_disposition =~ /^attachment/ }
         self.class.view_paths.first.find_all(@template, {}, @mailer_name).each do |template|
           @parts << create_inline_part(render_to_body(:_template => template), template.mime_type)
         end