1 files changed, 9 insertions, 29 deletions
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb
index ca67700273..ce22833b11 100644
--- a/activejob/test/helper.rb
+++ b/activejob/test/helper.rb
@@ -1,6 +1,7 @@
 require File.expand_path('../../../load_paths', __FILE__)
 
 require 'active_job'
+require 'support/job_buffer'
 
 GlobalID.app = 'aj'
 
@@ -10,41 +11,20 @@ def sidekiq?
   @adapter == 'sidekiq'
 end
 
-def rubinius?
-  RUBY_ENGINE == 'rbx'
-end
-
 def ruby_193?
   RUBY_VERSION == '1.9.3' && RUBY_ENGINE != 'java'
 end
 
-#Sidekiq don't work with MRI 1.9.3
-#Travis uses rbx 2.6 which don't support unicode characters in methods.
-#Remove the check when Travis change to rbx 2.7+
-exit  if sidekiq?  && (ruby_193? || rubinius?)
+# Sidekiq doesn't work with MRI 1.9.3
+exit if sidekiq? && ruby_193?
 
-require "adapters/#{@adapter}"
+if ENV['AJ_INTEGRATION_TESTS']
+  require 'support/integration/helper'
+else
+  require "adapters/#{@adapter}"
+end
 
 require 'active_support/testing/autorun'
 
 ActiveJob::Base.logger.level = Logger::DEBUG
-
-module JobBuffer
-  class << self
-    def clear
-      @buffer = []
-    end
-
-    def add(value)
-      @buffer << value
-    end
-
-    def values
-      @buffer
-    end
-
-    def last_value
-      @buffer.last
-    end
-  end
-end
+ActiveSupport::TestCase.test_order = :random