Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wrap tests in Rails executor when configured #2753

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+12 −2
Open

Wrap tests in Rails executor when configured #2753

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b430027
Wrap examples with Rails executor
javierjulio Apr 6, 2024
f35b3a6
Account for Rails config default switch
javierjulio Apr 6, 2024
13958cc
Account for all known cases
javierjulio Apr 8, 2024
9622d9b
Merge branch 'rspec:main' into patch-2
javierjulio Apr 10, 2024
0cf0662
Update require/include statements
javierjulio Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions lib/rspec/rails/example/rails_example_group.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
# suite and ammeter.
require 'rspec/rails/matchers'

if ::Rails::VERSION::MAJOR >= 7
require 'active_support/current_attributes/test_helper'
require 'active_support/execution_context/test_helper'
end
JonRowe marked this conversation as resolved.
Show resolved Hide resolved

module RSpec
module Rails
# @api public
Expand All @@ -17,10 +12,23 @@ 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
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
end
Expand Down
Loading