File tree 3 files changed +12
-3
lines changed
spec/rspec/rails/matchers
3 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -28,13 +28,17 @@ def has_action_cable_testing?
28
28
end
29
29
30
30
def has_action_mailer_parameterized?
31
- has_action_mailer? && defined? ( ::ActionMailer ::Parameterized )
31
+ has_action_mailer? && defined? ( ::ActionMailer ::Parameterized :: DeliveryJob )
32
32
end
33
33
34
34
def has_action_mailer_unified_delivery?
35
35
has_action_mailer? && defined? ( ::ActionMailer ::MailDeliveryJob )
36
36
end
37
37
38
+ def has_action_mailer_legacy_delivery_job?
39
+ defined? ( ActionMailer ::DeliveryJob )
40
+ end
41
+
38
42
def has_action_mailbox?
39
43
defined? ( ::ActionMailbox )
40
44
end
Original file line number Diff line number Diff line change @@ -131,7 +131,7 @@ def mail_job_message(job)
131
131
end
132
132
133
133
def legacy_mail? ( job )
134
- job [ :job ] <= ActionMailer ::DeliveryJob
134
+ RSpec :: Rails :: FeatureCheck . has_action_mailer_legacy_delivery_job? && job [ :job ] <= ActionMailer ::DeliveryJob
135
135
end
136
136
137
137
def parameterized_mail? ( job )
Original file line number Diff line number Diff line change @@ -22,7 +22,12 @@ def test_email; end
22
22
def email_with_args ( arg1 , arg2 ) ; end
23
23
end
24
24
25
- class DeliveryJobSubClass < ActionMailer ::DeliveryJob
25
+ if RSpec ::Rails ::FeatureCheck . has_action_mailer_legacy_delivery_job?
26
+ class DeliveryJobSubClass < ActionMailer ::DeliveryJob
27
+ end
28
+ else
29
+ class DeliveryJobSubClass < ActionMailer ::MailDeliveryJob
30
+ end
26
31
end
27
32
28
33
class UnifiedMailerWithDeliveryJobSubClass < ActionMailer ::Base
You can’t perform that action at this time.
0 commit comments