diff options
| author | David Heinemeier Hansson <david@basecamp.com> | 2014-08-08 09:15:30 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@basecamp.com> | 2014-08-08 09:15:30 -0700 |
| commit | 14f74a8331f94150dfee653224de8fc837797709 (patch) | |
| tree | 5a4c62c14e115ff4ee05212664bb2ff5b8595c38 /test/helper.rb | |
| parent | 06ccd5f405a004275915102eb3ccc42b952ba549 (diff) | |
| parent | 664546c208c406bba08b8eda2e6a600154d7232e (diff) | |
| download | rails-14f74a8331f94150dfee653224de8fc837797709.tar.gz rails-14f74a8331f94150dfee653224de8fc837797709.tar.bz2 rails-14f74a8331f94150dfee653224de8fc837797709.zip | |
Merge pull request #102 from cristianbica/integration_tests
Integration testing
Diffstat (limited to 'test/helper.rb')
| -rw-r--r-- | test/helper.rb | 12 |
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 |