diff --git a/lib/rspec/rails/example/rails_example_group.rb b/lib/rspec/rails/example/rails_example_group.rb index ed343de35..3530ee28f 100644 --- a/lib/rspec/rails/example/rails_example_group.rb +++ b/lib/rspec/rails/example/rails_example_group.rb @@ -17,10 +17,20 @@ module RailsExampleGroup include RSpec::Rails::MinitestLifecycleAdapter include RSpec::Rails::MinitestAssertionAdapter include RSpec::Rails::FixtureSupport + if ::Rails::VERSION::MAJOR >= 7 include RSpec::Rails::TaggedLoggingAdapter - include ActiveSupport::CurrentAttributes::TestHelper - include ActiveSupport::ExecutionContext::TestHelper + + if ::Rails.configuration.active_support.executor_around_test_case + included do |_other| + around do |example| + ::Rails.application.executor.perform { example.call } + end + end + else + include ActiveSupport::CurrentAttributes::TestHelper + include ActiveSupport::ExecutionContext::TestHelper + end end end end