4 files changed, 41 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 6203699405..97ff62fa87 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1 +1,8 @@
+*   Allow preview interceptors to be registered through
+    `config.action_mailer.preview_interceptors`.
+
+    See #15739.
+
+    *Yves Senn*
+
 Please check [4-1-stable](https://github.com/rails/rails/blob/4-1-stable/actionmailer/CHANGELOG.md) for previous changes.
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 893eca2eef..135cf35ac0 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -340,7 +340,7 @@ module ActionMailer
   #     end
   #   end
   #
-  #   ActionMailer::Base.register_preview_interceptor :css_inline_styler
+  #   config.action_mailer.preview_interceptors :css_inline_styler
   #
   # Note that interceptors need to be registered both with <tt>register_interceptor</tt>
   # and <tt>register_preview_interceptor</tt> if they should operate on both sending and
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index 8d1e40297b..671551fa53 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -33,6 +33,7 @@ module ActionMailer
         include app.routes.mounted_helpers
 
         register_interceptors(options.delete(:interceptors))
+        register_preview_interceptors(options.delete(:preview_interceptors))
         register_observers(options.delete(:observers))
 
         options.each { |k,v| send("#{k}=", v) }
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index e95c3fa20d..207a0c7e86 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -8,6 +8,12 @@ end
 
 class ::MyOtherMailInterceptor < ::MyMailInterceptor; end
 
+class ::MyPreviewMailInterceptor
+  def self.previewing_email(email); email; end
+end
+
+class ::MyOtherPreviewMailInterceptor < ::MyPreviewMailInterceptor; end
+
 class ::MyMailObserver
   def self.delivered_email(email); email; end
 end
@@ -460,6 +466,32 @@ module ApplicationTests
       assert_equal [::MyMailInterceptor, ::MyOtherMailInterceptor], ::Mail.send(:class_variable_get, "@@delivery_interceptors")
     end
 
+    test "registers preview interceptors with ActionMailer" do
+      add_to_config <<-RUBY
+        config.action_mailer.preview_interceptors = MyPreviewMailInterceptor
+      RUBY
+
+      require "#{app_path}/config/environment"
+      require "mail"
+
+      _ = ActionMailer::Base
+
+      assert_equal [::MyPreviewMailInterceptor], ActionMailer::Base.preview_interceptors
+    end
+
+    test "registers multiple preview interceptors with ActionMailer" do
+      add_to_config <<-RUBY
+        config.action_mailer.preview_interceptors = [MyPreviewMailInterceptor, "MyOtherPreviewMailInterceptor"]
+      RUBY
+
+      require "#{app_path}/config/environment"
+      require "mail"
+
+      _ = ActionMailer::Base
+
+      assert_equal [MyPreviewMailInterceptor, MyOtherPreviewMailInterceptor], ActionMailer::Base.preview_interceptors
+    end
+
     test "registers observers with ActionMailer" do
       add_to_config <<-RUBY
         config.action_mailer.observers = MyMailObserver