Merge ff440ee into c6e582d

projectblacklight · Feb 1, 2014 · ec5649b · ec5649b
2 parents c6e582d + ff440ee
commit ec5649b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,6 +3,10 @@ source 'https://rubygems.org'
 # Please see blacklight.gemspec for dependency information.
 gemspec
 
+
+gem 'simplecov', require: false
+gem 'coveralls', require: false
+
 group :test do
   gem 'devise'
   gem 'devise-guests'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -5,13 +5,12 @@
 
 ENV["RAILS_ENV"] ||= 'test'
 
-ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
-if ENV['COVERAGE'] and ruby_engine != "jruby"
+if ENV["COVERAGE"] or ENV["CI"]
   require 'simplecov'
+  require 'coveralls'
 
-  SimpleCov.start do
-    root File.expand_path(File.dirname(__FILE__) + "../../..")
-  end
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.start
 end
 
 require 'blacklight'