Added .coveralls.yml; Reconfigured test suite to use Coveralls properly

rex · Feb 26, 2014 · 2a87b83 · 2a87b83
1 parent ecb5058
commit 2a87b83
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
@@ -0,0 +1 @@
+service_name: travis-ci
diff --git a/test/helper.rb b/test/helper.rb
@@ -1,8 +1,7 @@
 require 'simplecov'
 require 'coveralls'
 
-Coveralls.wear!
-
+=begin
 module SimpleCov::Configuration
   def clean_filters
     @filters = []
@@ -17,6 +16,8 @@ def clean_filters
 ENV["COVERAGE"] && SimpleCov.start do
   add_filter "/.rvm/"
 end
+=end
+
 require 'rubygems'
 require 'bundler'
 begin
@@ -29,6 +30,17 @@ def clean_filters
 require 'test/unit'
 require 'shoulda'
 
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+
+ENV["COVERAGE"] && SimpleCov.start do
+  add_filter "/.rvm/"
+end
+
+Coveralls.wear!
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'server'