1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

use _action callbacks in actionmailer

This commit is contained in:
Francesco Rodriguez 2012-12-08 10:20:59 -05:00
parent bef330803a
commit 4ec7493e3c
5 changed files with 19 additions and 19 deletions

View file

@ -284,12 +284,12 @@ module ActionMailer
#
# = Callbacks
#
# You can specify callbacks using before_filter and after_filter for configuring your messages.
# You can specify callbacks using before_action and after_action for configuring your messages.
# This may be useful, for example, when you want to add default inline attachments for all
# messages sent out by a certain mailer class:
#
# class Notifier < ActionMailer::Base
# before_filter :add_inline_attachment!
# before_action :add_inline_attachment!
#
# def welcome
# mail
@ -306,8 +306,8 @@ module ActionMailer
# can define and configure callbacks in the same manner that you would use callbacks in
# classes that inherit from ActionController::Base.
#
# Note that unless you have a specific reason to do so, you should prefer using before_filter
# rather than after_filter in your ActionMailer classes so that headers are parsed properly.
# Note that unless you have a specific reason to do so, you should prefer using before_action
# rather than after_action in your ActionMailer classes so that headers are parsed properly.
#
# = Configuration options
#

View file

@ -584,9 +584,9 @@ class BaseTest < ActiveSupport::TestCase
assert_equal("Thanks for signing up this afternoon", mail.subject)
end
test "modifying the mail message with a before_filter" do
class BeforeFilterMailer < ActionMailer::Base
before_filter :add_special_header!
test "modifying the mail message with a before_action" do
class BeforeActionMailer < ActionMailer::Base
before_action :add_special_header!
def welcome ; mail ; end
@ -596,12 +596,12 @@ class BaseTest < ActiveSupport::TestCase
end
end
assert_equal('Wow, so special', BeforeFilterMailer.welcome['X-Special-Header'].to_s)
assert_equal('Wow, so special', BeforeActionMailer.welcome['X-Special-Header'].to_s)
end
test "modifying the mail message with an after_filter" do
class AfterFilterMailer < ActionMailer::Base
after_filter :add_special_header!
test "modifying the mail message with an after_action" do
class AfterActionMailer < ActionMailer::Base
after_action :add_special_header!
def welcome ; mail ; end
@ -611,12 +611,12 @@ class BaseTest < ActiveSupport::TestCase
end
end
assert_equal('Testing', AfterFilterMailer.welcome['X-Special-Header'].to_s)
assert_equal('Testing', AfterActionMailer.welcome['X-Special-Header'].to_s)
end
test "adding an inline attachment using a before_filter" do
test "adding an inline attachment using a before_action" do
class DefaultInlineAttachmentMailer < ActionMailer::Base
before_filter :add_inline_attachment!
before_action :add_inline_attachment!
def welcome ; mail ; end

View file

@ -1,10 +1,10 @@
require 'abstract_unit'
class ControllerWithBeforeFilterAndDefaultUrlOptions < ActionController::Base
class ControllerWithBeforeActionAndDefaultUrlOptions < ActionController::Base
before_filter { I18n.locale = params[:locale] }
after_filter { I18n.locale = "en" }
before_action { I18n.locale = params[:locale] }
after_action { I18n.locale = "en" }
def target
render :text => "final response"
@ -19,11 +19,11 @@ class ControllerWithBeforeFilterAndDefaultUrlOptions < ActionController::Base
end
end
class ControllerWithBeforeFilterAndDefaultUrlOptionsTest < ActionController::TestCase
class ControllerWithBeforeActionAndDefaultUrlOptionsTest < ActionController::TestCase
# This test has its roots in issue #1872
test "should redirect with correct locale :de" do
get :redirect, :locale => "de"
assert_redirected_to "/controller_with_before_filter_and_default_url_options/target?locale=de"
assert_redirected_to "/controller_with_before_action_and_default_url_options/target?locale=de"
end
end