diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-11-19 09:35:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-19 09:35:55 -0800 |
| commit | 9893998f4a8d3edd64ab0c8efbfb3c385e33befa (patch) | |
| tree | e5f5f2bb9a112c16c503ca2dce5458f28eb8d8f0 /railties | |
| parent | 317bf45c24e6d78ec5349eadd2683aca7e7fe7e8 (diff) | |
| parent | 0712dfd6ae1423269af1512c3403ee1145f27de1 (diff) | |
| download | rails-9893998f4a8d3edd64ab0c8efbfb3c385e33befa.tar.gz rails-9893998f4a8d3edd64ab0c8efbfb3c385e33befa.tar.bz2 rails-9893998f4a8d3edd64ab0c8efbfb3c385e33befa.zip | |
Merge pull request #34410 from gmcgibbon/test_support_windows
Windows support for parallelization and instrumenter
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/test_helper.rb.tt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb.tt b/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb.tt index c918b57eca..c06cd525d7 100644 --- a/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb.tt @@ -4,7 +4,7 @@ require 'rails/test_help' class ActiveSupport::TestCase # Run tests in parallel with specified workers -<% if defined?(JRUBY_VERSION) -%> +<% if defined?(JRUBY_VERSION) || Gem.win_platform? -%> parallelize(workers: 2, with: :threads) <%- else -%> parallelize(workers: 2) |