Only use Coveralls in Travis-CI

public-activity · Nov 16, 2013 · c2f3891 · c2f3891
1 parent 960035d
commit c2f3891
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,19 +6,19 @@ matrix:
   include:
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile.rails-3.X
-      env: COV=1 PA_ORM=active_record
+      env: PA_ORM=active_record
     - rvm: 1.9.3
       gemfile: gemfiles/Gemfile.rails-3.X
-      env: COV=1 PA_ORM=active_record
+      env: PA_ORM=active_record
     - rvm: 1.9.3
       gemfile: gemfiles/Gemfile.rails-4.0
-      env: COV=1 PA_ORM=active_record
+      env: PA_ORM=active_record
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile.rails-4.0
-      env: COV=1 PA_ORM=active_record
+      env: PA_ORM=active_record
 env:
-  - COV=1 PA_ORM=mongoid
-  - COV=1 PA_ORM=mongo_mapper
+  - PA_ORM=mongoid
+  - PA_ORM=mongo_mapper
 services:
   - mongodb
 email:

diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 gemspec
 
-gem 'coveralls', group: :test
+gem 'coveralls', require: false, group: :test
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -5,16 +5,14 @@
 
 if ENV['COV']
   require 'simplecov'
-  require 'coveralls'
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::HTMLFormatter,
-    Coveralls::SimpleCov::Formatter
-  ]
-  Coveralls.wear_merged!
   SimpleCov.start do
     add_filter "/test/"
   end
+elsif ENV["TRAVIS"] # in Travis-CI
+  require 'coveralls'
+  Coveralls.wear_merged!
 end
+
 $:.unshift File.expand_path('../../lib/', __FILE__)
 require 'active_support/testing/setup_and_teardown'
 require 'public_activity'