aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorGannon McGibbon <gannon.mcgibbon@gmail.com>2018-11-08 10:59:52 -0500
committerGannon McGibbon <gannon.mcgibbon@gmail.com>2018-11-08 12:07:21 -0500
commit0712dfd6ae1423269af1512c3403ee1145f27de1 (patch)
tree80daa81c448df725c12aba55e3e2d8bb28066da0 /railties
parentfc2684c9c012b95ce003cce22b378d5ea9ab56d3 (diff)
downloadrails-0712dfd6ae1423269af1512c3403ee1145f27de1.tar.gz
rails-0712dfd6ae1423269af1512c3403ee1145f27de1.tar.bz2
rails-0712dfd6ae1423269af1512c3403ee1145f27de1.zip
Windows support for parallelization and instrumenter
Add Windows support for `ActiveSupport::Testing::Parallelization` and `ActiveSupport::Notifications::Instrumenter`.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/test/test_helper.rb.tt2
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)