mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Using InstanceMethods in a Concern is deprecated
This commit is contained in:
parent
3b07bb33e1
commit
b757663af7
1 changed files with 6 additions and 10 deletions
|
@ -15,6 +15,12 @@ module ActionMailer
|
||||||
|
|
||||||
include TestHelper
|
include TestHelper
|
||||||
|
|
||||||
|
included do
|
||||||
|
class_attribute :_mailer_class
|
||||||
|
setup :initialize_test_deliveries
|
||||||
|
setup :set_expected_mail
|
||||||
|
end
|
||||||
|
|
||||||
module ClassMethods
|
module ClassMethods
|
||||||
def tests(mailer)
|
def tests(mailer)
|
||||||
case mailer
|
case mailer
|
||||||
|
@ -42,8 +48,6 @@ module ActionMailer
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
module InstanceMethods
|
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def initialize_test_deliveries
|
def initialize_test_deliveries
|
||||||
|
@ -71,16 +75,8 @@ module ActionMailer
|
||||||
def read_fixture(action)
|
def read_fixture(action)
|
||||||
IO.readlines(File.join(Rails.root, 'test', 'fixtures', self.class.mailer_class.name.underscore, action))
|
IO.readlines(File.join(Rails.root, 'test', 'fixtures', self.class.mailer_class.name.underscore, action))
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
included do
|
|
||||||
class_attribute :_mailer_class
|
|
||||||
setup :initialize_test_deliveries
|
|
||||||
setup :set_expected_mail
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
include Behavior
|
include Behavior
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue