Merge pull request #1400 from jnicklas/rails_threading
Use Rack::Lock to prevent concurrency when eager_load is false
This commit is contained in:
commit
1b3344c00c
|
@ -2,6 +2,12 @@ require 'capybara'
|
|||
require 'capybara/dsl'
|
||||
|
||||
Capybara.app = Rack::Builder.new do
|
||||
# Work around an issue where rails allows concurrency in test mode even though eager_load
|
||||
# is false which can cause an issue with constant loading
|
||||
if Gem::Version.new(Rails.version) >= Gem::Version.new("4.0")
|
||||
use Rack::Lock unless Rails.application.config.eager_load || Rails.application.middleware.include?(Rack::Lock)
|
||||
end
|
||||
|
||||
map "/" do
|
||||
if Gem::Version.new(Rails.version) >= Gem::Version.new("3.0")
|
||||
run Rails.application
|
||||
|
|
Loading…
Reference in New Issue