.travis

glebm · Mar 7, 2015 · c2ec5ea · c2ec5ea
1 parent 53a1ee4
commit c2ec5ea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 2.2.0
+  - 2.2.1
   - jruby
-  - rbx-2
+  - rbx
 gemfile:
   - spec/gemfiles/Gemfile-rails-3-2
   # rails 4:
@@ -16,6 +16,8 @@ env:
   - secure: Kh43fq+MfpGNfQ/0IBhMnbzixVS5+K2QFPPwYfcS9ISgMASY2MAbNS1ZaD9HJ5Ynta8tnqS2QodwfQavDYI4tsFXcJ8RXbGK7GX2BKKuhH2ZfwuTGgltg0W1zTJR/18PL6jlMqon4lPnjaQQhis/WhBHqjkxHNIDzYWocZo/hc0=
 matrix:
   allow_failures:
-  - rvm: rbx-2
+  - rvm: rbx
   exclude:
-  - {rvm: 2.2, gemfile: spec/gemfiles/Gemfile-rails-3-2}
+  - rvm: 2.2.1
+    gemfile: spec/gemfiles/Gemfile-rails-3-2
+cache: bundler
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -3,7 +3,11 @@
 ENV['RAILS_ENV'] = ENV['RACK_ENV'] = 'test'
 if ENV['TRAVIS'] && !(defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx')
   require 'codeclimate-test-reporter'
-  CodeClimate::TestReporter.start
+  if CodeClimate::TestReporter.run?
+    require 'simplecov'
+    SimpleCov.add_filter 'spec/gemfiles/vendor/bundle'
+    CodeClimate::TestReporter.start
+  end
 end
 
 require File.expand_path('../dummy/config/environment.rb', __FILE__)