Rename preview_enabled option to show_previews

2 files changed, 7 insertions, 7 deletions

diff --git a/actionmailer/lib/action_mailer/preview.rb b/actionmailer/lib/action_mailer/preview.rb
index f27fab1a0d..33de1dc049 100644
--- a/actionmailer/lib/action_mailer/preview.rb
+++ b/actionmailer/lib/action_mailer/preview.rb
@@ -13,11 +13,11 @@ module ActionMailer
 
       # Enable or disable mailer previews through app configuration:
       #
-      #     config.action_mailer.preview_enabled = true
+      #     config.action_mailer.show_previews = true
       #
       # Defaults to true for development environment
       #
-      mattr_accessor :preview_enabled, instance_writer: false
+      mattr_accessor :show_previews, instance_writer: false
 
       # :nodoc:
       mattr_accessor :preview_interceptors, instance_writer: false
@@ -102,8 +102,8 @@ module ActionMailer
           Base.preview_path
         end
 
-        def preview_enabled #:nodoc:
-          Base.preview_enabled
+        def show_previews #:nodoc:
+          Base.show_previews
         end
 
         def inform_preview_interceptors(message) #:nodoc:
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index 409a7a897a..6f760732e2 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -18,9 +18,9 @@ module ActionMailer
       options.assets_dir      ||= paths["public"].first
       options.javascripts_dir ||= paths["public/javascripts"].first
       options.stylesheets_dir ||= paths["public/stylesheets"].first
-      options.preview_enabled = Rails.env.development? if options.preview_enabled.nil?
+      options.show_previews = Rails.env.development? if options.show_previews.nil?
 
-      if options.preview_enabled
+      if options.show_previews
         options.preview_path  ||= defined?(Rails.root) ? "#{Rails.root}/test/mailers/previews" : nil
       end
 
@@ -39,7 +39,7 @@ module ActionMailer
 
         options.each { |k,v| send("#{k}=", v) }
 
-        if options.preview_enabled
+        if options.show_previews
           app.routes.append do
             get '/rails/mailers'         => "rails/mailers#index"
             get '/rails/mailers/*path'   => "rails/mailers#preview"