Use rspec configuration properly

Author: pitr-ch

spec/spec_helper.rb

@@ -33,4 +33,20 @@
   config.order = 'random'
   config.disable_monkey_patching!
   config.example_status_persistence_file_path = 'spec/examples.txt'
+
+  config.include Concurrent::TestHelpers
+  config.extend Concurrent::TestHelpers
+
+  config.before :each do
+    expect(!defined?(@created_threads) || @created_threads.nil? || @created_threads.empty?).to be_truthy
+  end
+
+  config.after :each do
+    while defined?(@created_threads) && @created_threads && (thread = (@created_threads.pop(true) rescue nil))
+      thread.kill
+      thread_join = thread.join(0.25)
+      expect(thread_join).not_to be_nil
+    end
+  end
+
 end

spec/support/example_group_extensions.rb

@@ -28,7 +28,7 @@ def monotonic_interval
 
     def in_thread(*args, &block)
       @created_threads ||= Queue.new
-      new_thread = Thread.new(*args) do |*args, &b|
+      new_thread       = Thread.new(*args) do |*args, &b|
         Thread.abort_on_exception = true
         block.call *args, &b
       end
@@ -49,19 +49,3 @@ def join_with(threads, timeout = 5)
     end
   end
 end
-
-class RSpec::Core::ExampleGroup
-  include Concurrent::TestHelpers
-  extend Concurrent::TestHelpers
-
-  before :each do
-    expect(@created_threads.nil? || @created_threads.empty?).to be_truthy
-  end
-
-  after :each do
-    while (thread = (@created_threads.pop(true) rescue nil))
-      thread.kill
-      expect(thread.join(0.25)).not_to be_nil
-    end
-  end
-end