From 43ee2d8ce52e85c696a0b93ee1bafa13974be0d9 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Wed, 23 Sep 2015 10:09:47 +0900
Subject: stop using deprecated method in mailers controller

Accessing mime types via constants is deprecated.
---
 railties/lib/rails/mailers_controller.rb                  | 2 +-
 railties/lib/rails/templates/rails/mailers/email.html.erb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/railties/lib/rails/mailers_controller.rb b/railties/lib/rails/mailers_controller.rb
index ed0ea9dd4d..38004fe99a 100644
--- a/railties/lib/rails/mailers_controller.rb
+++ b/railties/lib/rails/mailers_controller.rb
@@ -31,7 +31,7 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
             raise AbstractController::ActionNotFound, "Email part '#{part_type}' not found in #{@preview.name}##{@email_action}"
           end
         else
-          @part = find_preferred_part(request.format, Mime::HTML, Mime::TEXT)
+          @part = find_preferred_part(request.format, Mime::Type[:HTML], Mime::Type[:TEXT])
           render action: 'email', layout: false, formats: %w[html]
         end
       else
diff --git a/railties/lib/rails/templates/rails/mailers/email.html.erb b/railties/lib/rails/templates/rails/mailers/email.html.erb
index bb6e49966d..cf95cd8ad0 100644
--- a/railties/lib/rails/templates/rails/mailers/email.html.erb
+++ b/railties/lib/rails/templates/rails/mailers/email.html.erb
@@ -95,8 +95,8 @@
     <% if @email.multipart? %>
       <dd>
         <select onchange="document.getElementsByName('messageBody')[0].src=this.options[this.selectedIndex].value;">
-          <option <%= request.format == Mime::HTML ? 'selected' : '' %> value="?part=text%2Fhtml">View as HTML email</option>
-          <option <%= request.format == Mime::TEXT ? 'selected' : '' %> value="?part=text%2Fplain">View as plain-text email</option>
+          <option <%= request.format == Mime::Type[:HTML] ? 'selected' : '' %> value="?part=text%2Fhtml">View as HTML email</option>
+          <option <%= request.format == Mime::Type[:TEXT] ? 'selected' : '' %> value="?part=text%2Fplain">View as plain-text email</option>
         </select>
       </dd>
     <% end %>
-- 
cgit v1.2.3