diff --git a/Gemfile.lock b/Gemfile.lock index 05af70db..4e5e1ec3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,6 +2,7 @@ PATH remote: . specs: parallel_tests (4.7.1) + concurrent-ruby (~> 1.0, >= 1.3.1) parallel GEM @@ -17,7 +18,7 @@ GEM builder (3.2.4) bump (0.10.0) colorize (1.1.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.3.3) cucumber (4.1.0) builder (~> 3.2, >= 3.2.3) cucumber-core (~> 7.1, >= 7.1.0) diff --git a/lib/parallel_tests.rb b/lib/parallel_tests.rb index 71d42dfb..434d9df3 100644 --- a/lib/parallel_tests.rb +++ b/lib/parallel_tests.rb @@ -2,6 +2,7 @@ require "parallel" require "parallel_tests/railtie" if defined? Rails::Railtie require "rbconfig" +require "concurrent-ruby" module ParallelTests WINDOWS = (RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/) @@ -17,7 +18,7 @@ def determine_number_of_processes(count) [ count, ENV["PARALLEL_TEST_PROCESSORS"], - Parallel.processor_count + Concurrent.available_processor_count ].detect { |c| !c.to_s.strip.empty? }.to_i end diff --git a/parallel_tests.gemspec b/parallel_tests.gemspec index 14757587..d96f59a6 100644 --- a/parallel_tests.gemspec +++ b/parallel_tests.gemspec @@ -17,5 +17,6 @@ Gem::Specification.new name, ParallelTests::VERSION do |s| s.license = "MIT" s.executables = ["parallel_spinach", "parallel_cucumber", "parallel_rspec", "parallel_test"] s.add_runtime_dependency "parallel" + s.add_runtime_dependency "concurrent-ruby", "~> 1.0", ">= 1.3.1" s.required_ruby_version = '>= 3.0.0' end diff --git a/spec/parallel_tests_spec.rb b/spec/parallel_tests_spec.rb index bed4b9b6..33da52a4 100644 --- a/spec/parallel_tests_spec.rb +++ b/spec/parallel_tests_spec.rb @@ -4,7 +4,7 @@ describe ParallelTests do describe ".determine_number_of_processes" do before do - allow(Parallel).to receive(:processor_count).and_return 20 + allow(Concurrent).to receive(:available_processor_count).and_return 20 end def call(count)