wip: Extract arg condition method

Author: pirj

lib/rspec/rails/feature_check.rb

@@ -43,8 +43,11 @@ def has_action_mailbox?
         defined?(::ActionMailbox)
       end
 
-      def ruby_3_1?
-        RUBY_VERSION >= "3.1"
+      # TODO: add a self-explanatory method name. See https://github.com/rspec/rspec-rails/pull/2552#issuecomment-1009508693 for hints
+      def rails_6_1_and_ruby_3_1?
+        return false if RUBY_VERSION < "3.1"
+
+        ::Rails::VERSION::STRING >= "6.1" && ::Rails::VERSION::STRING < "7"
       end
 
       def type_metatag(type)

lib/rspec/rails/matchers/have_enqueued_mail.rb

@@ -102,19 +102,11 @@ def process_arguments(job, given_mail_args)
 
         def use_given_mail_args?(job)
           return true if FeatureCheck.has_action_mailer_parameterized? && job[:job] <= ActionMailer::Parameterized::DeliveryJob
-          return false if rails_6_1_and_ruby_3_1?
+          return false if FeatureCheck.rails_6_1_and_ruby_3_1?
 
           !(FeatureCheck.has_action_mailer_unified_delivery? && job[:job] <= ActionMailer::MailDeliveryJob)
         end
 
-        # TODO: move to FeatureCheck
-        def rails_6_1_and_ruby_3_1?
-          return false unless RUBY_VERSION >= "3.1"
-          return false unless ::Rails::VERSION::STRING >= '6.1'
-
-          ::Rails::VERSION::STRING < '7'
-        end
-
         def base_mailer_args
           [mailer_class_name, @method_name.to_s, MAILER_JOB_METHOD]
         end