Skip to content

Commit

Permalink
Merge ff440ee into c6e582d
Browse files Browse the repository at this point in the history
  • Loading branch information
cbeer committed Feb 1, 2014
2 parents c6e582d + ff440ee commit ec5649b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
9 changes: 4 additions & 5 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit ec5649b

Please sign in to comment.