aboutsummaryrefslogtreecommitdiffstats
path: root/test/helper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'test/helper.rb')
-rw-r--r--test/helper.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/test/helper.rb b/test/helper.rb
index 7ba7607df2..104dabd861 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -6,10 +6,14 @@ $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
require 'active_job'
adapter = ENV['AJADAPTER'] || 'inline'
-require "adapters/#{adapter}"
-puts "Testing using #{adapter}"
+puts "Testing#{" integration" if ENV['AJ_INTEGRATION_TESTS']} using #{adapter}"
-require 'active_support/testing/autorun'
+if ENV['AJ_INTEGRATION_TESTS']
+ require 'support/integration/helper'
+else
+ require "adapters/#{adapter}"
+end
+require 'active_support/testing/autorun'
-ActiveJob::Base.logger.level = Logger::ERROR
+ActiveJob::Base.logger.level = Logger::DEBUG