aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/test/helper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activejob/test/helper.rb')
-rw-r--r--activejob/test/helper.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb
index 85094387ef..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'
@@ -17,8 +18,13 @@ end
# 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
+ActiveSupport::TestCase.test_order = :random