diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 00000000..7008d5a9 --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1 @@ +service_name: travis-pro \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index de3899a2..1c4deca4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ rvm: env: global: - NOKOGIRI_USE_SYSTEM_LIBRARIES=true + - COVERAGE=true script: "rake ci" diff --git a/Gemfile b/Gemfile index 07319727..2232eb4e 100644 --- a/Gemfile +++ b/Gemfile @@ -11,3 +11,6 @@ gemspec # your gem to rubygems.org. # # + +gem 'coveralls', require: false +gem 'simplecov', require: false \ No newline at end of file diff --git a/README.md b/README.md index 765f41dc..f0c06157 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Curate [![Version](https://badge.fury.io/rb/curate.png)](http://badge.fury.io/rb/curate) [![Build Status](https://travis-ci.org/projecthydra/curate.png?branch=master)](https://travis-ci.org/projecthydra/curate) +# Curate [![Version](https://badge.fury.io/rb/curate.png)](http://badge.fury.io/rb/curate) [![Build Status](https://travis-ci.org/projecthydra/curate.png?branch=master)](https://travis-ci.org/projecthydra/curate) [![Coverage Status](https://coveralls.io/repos/projecthydra/curate/badge.png)](https://coveralls.io/r/projecthydra/curate) ## Starting a New Curate Base Application diff --git a/curate.gemspec b/curate.gemspec index 56f6506c..570b4bc0 100644 --- a/curate.gemspec +++ b/curate.gemspec @@ -47,7 +47,6 @@ Gem::Specification.new do |s| s.add_development_dependency 'sqlite3' s.add_development_dependency "rspec-rails" s.add_development_dependency "factory_girl_rails" - s.add_development_dependency "coco" s.add_development_dependency 'rspec-html-matchers' s.add_development_dependency 'capybara' s.add_development_dependency 'timecop' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e51a5dca..39b1c972 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,7 +2,23 @@ ENV["RAILS_ENV"] ||= 'test' if ENV['COVERAGE'] - require 'coco' + require 'coveralls' + require 'simplecov' + + ENGINE_ROOT = File.expand_path('../..', __FILE__) + + # Out of the box, SimpleCov was looking at file in ENGINE_ROOT/spec/internal; + # After all that was where Rails was pointed at. + SimpleCov.formatter = Coveralls::SimpleCov::Formatter + SimpleCov.root(ENGINE_ROOT) + SimpleCov.start 'rails' do + filters.clear + add_filter do |src| + src.filename !~ /^#{ENGINE_ROOT}/ + end + add_filter '/spec/' + end + SimpleCov.command_name "spec" end require File.expand_path("../internal/config/environment.rb", __FILE__) diff --git a/tasks/curate_tasks.rake b/tasks/curate_tasks.rake index d75000bb..9ebfdb02 100644 --- a/tasks/curate_tasks.rake +++ b/tasks/curate_tasks.rake @@ -49,13 +49,15 @@ task :generate do gem 'database_cleaner', '< 1.1.0', :group => :test gem 'test_after_commit', group: :test gem 'poltergeist', group: :test - gem 'coco', group: :test, require: false + gem 'simplecov', group: :test, require: false + gem 'coveralls', group: :test, require: false gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype' EOV gemfile_content << "gem 'debugger'" unless ENV['TRAVIS'] `echo "#{gemfile_content}" >> #{DUMMY_APP}/Gemfile` + puts "Copying generator" system_with_command_output("cp -r spec/skeleton/* #{DUMMY_APP}") Bundler.with_clean_env do