Bump up minitest dependency and remove our own reinvented version of ParallelEach

1 files changed, 1 insertions, 37 deletions

diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index dca91e8b75..d70d971538 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -1,8 +1,5 @@
 require 'rbconfig'
-begin
-  require 'minitest/parallel_each'
-rescue LoadError
-end
+require 'minitest/parallel_each'
 
 module ActiveSupport
   module Testing
@@ -48,39 +45,6 @@ module ActiveSupport
     module Isolation
       require 'thread'
 
-      # Recent versions of MiniTest (such as the one shipped with Ruby 2.0) already define
-      # a ParallelEach class.
-      unless defined? ParallelEach
-        class ParallelEach
-          include Enumerable
-
-          # default to 2 cores
-          CORES = (ENV['TEST_CORES'] || 2).to_i
-
-          def initialize list
-            @list  = list
-            @queue = SizedQueue.new CORES
-          end
-
-          def grep pattern
-            self.class.new super
-          end
-
-          def each
-            threads = CORES.times.map {
-              Thread.new {
-                while job = @queue.pop
-                  yield job
-                end
-              }
-            }
-            @list.each { |i| @queue << i }
-            CORES.times { @queue << nil }
-            threads.each(&:join)
-          end
-        end
-      end
-
       def self.included(klass) #:nodoc:
         klass.extend(Module.new {
           def test_methods