aboutsummaryrefslogtreecommitdiffstats
path: root/test/helper.rb
diff options
context:
space:
mode:
authorCristian Bica <cristian.bica@gmail.com>2014-08-05 09:05:14 +0300
committerCristian Bica <cristian.bica@gmail.com>2014-08-08 10:52:16 +0300
commit664546c208c406bba08b8eda2e6a600154d7232e (patch)
tree5a4c62c14e115ff4ee05212664bb2ff5b8595c38 /test/helper.rb
parent06ccd5f405a004275915102eb3ccc42b952ba549 (diff)
downloadrails-664546c208c406bba08b8eda2e6a600154d7232e.tar.gz
rails-664546c208c406bba08b8eda2e6a600154d7232e.tar.bz2
rails-664546c208c406bba08b8eda2e6a600154d7232e.zip
Integration testing
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