diff --git a/lib/rspec/rails/example/rails_example_group.rb b/lib/rspec/rails/example/rails_example_group.rb index 0643b9ae1..fc5ec75da 100644 --- a/lib/rspec/rails/example/rails_example_group.rb +++ b/lib/rspec/rails/example/rails_example_group.rb @@ -2,10 +2,6 @@ # suite and ammeter. require 'rspec/rails/matchers' -if ::Rails::VERSION::MAJOR >= 7 - require 'active_support/execution_context/test_helper' -end - module RSpec module Rails # @api public @@ -16,9 +12,14 @@ module RailsExampleGroup include RSpec::Rails::MinitestLifecycleAdapter include RSpec::Rails::MinitestAssertionAdapter include RSpec::Rails::FixtureSupport + include RSpec::Rails::TaggedLoggingAdapter if ::Rails::VERSION::MAJOR >= 7 + if ::Rails::VERSION::MAJOR >= 7 - include RSpec::Rails::TaggedLoggingAdapter - include ActiveSupport::ExecutionContext::TestHelper + included do |_other| + around do |example| + ::Rails.application.executor.perform { example.call } + end + end end end end