Only pass a mailer-specific block to super if a block is provided

Author: Joel Lubrano

lib/rspec/rails/matchers/have_enqueued_mail.rb

@@ -28,10 +28,7 @@ def description
 
         def with(*args, &block)
           @mail_args = args
-
-          super(*mailer_args) do |*job_args|
-            block.call(*(job_args - base_mailer_args)) if block.present?
-          end
+          block.nil? ? super(*mailer_args) : super(*mailer_args, &yield_mail_args(block))
         end
 
         def matches?(block)
@@ -86,6 +83,10 @@ def base_mailer_args
           [@mailer_class.name, @method_name.to_s, MAILER_JOB_METHOD]
         end
 
+        def yield_mail_args(block)
+          Proc.new { |*job_args| block.call(*(job_args - base_mailer_args)) }
+        end
+
         def check_active_job_adapter
           return if ::ActiveJob::QueueAdapters::TestAdapter === ::ActiveJob::Base.queue_adapter
           raise StandardError, "To use HaveEnqueuedMail matcher set `ActiveJob::Base.queue_adapter = :test`"