diff --git a/.travis.yml b/.travis.yml index ac4a0ef7d..06ef9378f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,13 +11,12 @@ env: rvm: - 1.9.3 - 2.0.0 - - 2.1.1 - - rbx-2 - - ruby-head + - 2.1 - jruby-19mode - jruby-head + - rbx-2 + - ruby-head matrix: allow_failures: - - rvm: jruby-19mode - rvm: jruby-head - rvm: ruby-head diff --git a/spec/helper.rb b/spec/helper.rb index 1280470e0..4c9880fd3 100644 --- a/spec/helper.rb +++ b/spec/helper.rb @@ -1,3 +1,16 @@ +require 'simplecov' +require 'coveralls' + +SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ + SimpleCov::Formatter::HTMLFormatter, + Coveralls::SimpleCov::Formatter +] + +SimpleCov.start do + add_filter '/spec/' + minimum_coverage(89.48) +end + require 'logger' require 'rspec' @@ -8,15 +21,6 @@ require 'delayed_job' require 'delayed/backend/shared_spec' -require 'simplecov' -require 'coveralls' - -SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ - SimpleCov::Formatter::HTMLFormatter, - Coveralls::SimpleCov::Formatter -] -SimpleCov.start - Delayed::Worker.logger = Logger.new('/tmp/dj.log') ENV['RAILS_ENV'] = 'test'