Account for all known cases

javierjulio · JonRowe · commit 13958cc055a9 · 2024-04-10T10:21:50.000+01:00
This now matches what Rails 7+ does
diff --git a/lib/rspec/rails/example/rails_example_group.rb b/lib/rspec/rails/example/rails_example_group.rb
@@ -12,19 +12,22 @@ 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|
- if ::Rails.configuration.active_support.executor_around_test_case
+
+ if ::Rails.configuration.active_support.executor_around_test_case
+ included do |_other|
+ around do |example|
 ::Rails.application.executor.perform{example.call }
- else
- example.call
 end
 end
+ else
+ require 'active_support/current_attributes/test_helper'
+ include ActiveSupport::CurrentAttributes::TestHelper
+
+ require 'active_support/execution_context/test_helper'
+ include ActiveSupport::ExecutionContext::TestHelper
 end
 end
 end

-Original file line number
+Diff line change
 includeRSpec::Rails::MinitestLifecycleAdapter
 includeRSpec::Rails::MinitestAssertionAdapter
 includeRSpec::Rails::FixtureSupport
 -includeRSpec::Rails::TaggedLoggingAdapterif ::Rails::VERSION::MAJOR >= 7
 if ::Rails::VERSION::MAJOR >= 7
 includeRSpec::Rails::TaggedLoggingAdapter
 -includeActiveSupport::ExecutionContext::TestHelper
 -includeddo |_other|
 -arounddo |example|
 -if ::Rails.configuration.active_support.executor_around_test_case
++
 +if ::Rails.configuration.active_support.executor_around_test_case
 +includeddo |_other|
 +arounddo |example|
  ::Rails.application.executor.perform{example.call}
 -else
 -example.call
 end
 end
 +else
 +require'active_support/current_attributes/test_helper'
 +includeActiveSupport::CurrentAttributes::TestHelper
++
 +require'active_support/execution_context/test_helper'
 +includeActiveSupport::ExecutionContext::TestHelper
 end
 end
 end