From 8e6c6d854cdedad4bc082cf45a01d411ea26fb68 Mon Sep 17 00:00:00 2001
From: Alexey Zapparov <ixti@member.fsf.org>
Date: Mon, 30 May 2016 02:15:18 +0200
Subject: Pass request params to ActionMailer::Preview
---
actionmailer/lib/action_mailer/preview.rb | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
(limited to 'actionmailer/lib')
diff --git a/actionmailer/lib/action_mailer/preview.rb b/actionmailer/lib/action_mailer/preview.rb
index b0152aff03..87ba743f3d 100644
--- a/actionmailer/lib/action_mailer/preview.rb
+++ b/actionmailer/lib/action_mailer/preview.rb
@@ -52,6 +52,12 @@ module ActionMailer
class Preview
extend ActiveSupport::DescendantsTracker
+ attr_reader :params
+
+ def initialize(params = {})
+ @params = params
+ end
+
class << self
# Returns all mailer preview classes.
def all
@@ -62,8 +68,8 @@ module ActionMailer
# Returns the mail object for the given email name. The registered preview
# interceptors will be informed so that they can transform the message
# as they would if the mail was actually being delivered.
- def call(email)
- preview = new
+ def call(email, params = {})
+ preview = new(params)
message = preview.public_send(email)
inform_preview_interceptors(message)
message
--
cgit v1.2.3
From eddbb62f94f4fb63bec8fda0f82c0f1597c3af01 Mon Sep 17 00:00:00 2001
From: Philipe Fatio <me@phili.pe>
Date: Sat, 22 Apr 2017 19:45:51 +0200
Subject: Add missing require in ActionMailer
Without this, Action Mailer doesn't work like it used to on version 4.
The following snippet fails since version 5:
> require 'action_mailer'
> ActionMailer::Base
NameError: uninitialized constant ActiveSupport::Rescuable
---
actionmailer/lib/action_mailer.rb | 1 +
1 file changed, 1 insertion(+)
(limited to 'actionmailer/lib')
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 211190560a..8e59f033d0 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -25,6 +25,7 @@ require "abstract_controller"
require "action_mailer/version"
# Common Active Support usage in Action Mailer
+require "active_support"
require "active_support/rails"
require "active_support/core_ext/class"
require "active_support/core_ext/module/attr_internal"
--
cgit v1.2.3