Skip to content

Commit

Permalink
Refactor simplecov and coveralls
Browse files Browse the repository at this point in the history
  • Loading branch information
eliotjordan committed Aug 1, 2018
1 parent 487671b commit ef5b7fd
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 15 deletions.
4 changes: 0 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ source 'https://rubygems.org'
gemspec

group :development, :test do
gem 'coveralls', require: false
# Peg simplecov to < 0.8 until this is resolved:
# https://github.com/colszowka/simplecov/issues/281
gem 'simplecov', '~> 0.7.1', require: false
# See https://github.com/rails/rails/issues/32955
gem 'thor', '>= 0.19.0'
end
Expand Down
2 changes: 2 additions & 0 deletions geoblacklight.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,6 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'factory_bot_rails'
spec.add_development_dependency 'database_cleaner', '~> 1.3'
spec.add_development_dependency 'bixby'
spec.add_development_dependency 'coveralls'
spec.add_development_dependency 'simplecov'
end
27 changes: 16 additions & 11 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
ENV['RAILS_ENV'] ||= 'test'

require 'simplecov'
require 'coveralls'
SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
[
SimpleCov::Formatter::HTMLFormatter,
Coveralls::SimpleCov::Formatter
]
)
SimpleCov.start 'rails' do
add_filter 'lib/generators/geoblacklight/install_generator.rb'
add_filter 'lib/geoblacklight/version.rb'
add_filter 'lib/generators/geoblacklight/templates'
add_filter '/spec'
end

require 'factory_bot'
require 'database_cleaner'

require 'engine_cart'
require 'coveralls'
Coveralls.wear!('rails')
EngineCart.load_application!

require 'rails-controller-testing' if Rails::VERSION::MAJOR >= 5
Expand All @@ -23,17 +37,8 @@
end

Capybara.javascript_driver = :headless_chrome

Capybara.default_max_wait_time = 15

if ENV['COVERAGE'] || ENV['CI']
require 'simplecov'
SimpleCov.formatter = Coveralls::SimpleCov::Formatter
SimpleCov.start do
add_filter '/spec/'
end
end

require 'geoblacklight'

Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
Expand Down

0 comments on commit ef5b7fd

Please sign in to comment.