Skip to content

Commit

Permalink
Merge c9c2575 into d826fcf
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremyf committed Nov 23, 2013
2 parents d826fcf + c9c2575 commit 81802f9
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 4 deletions.
1 change: 1 addition & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
service_name: travis-pro
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ rvm:
env:
global:
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true
- COVERAGE=true

script: "rake ci"

Expand Down
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ gemspec
# your gem to rubygems.org.
#
#

gem 'coveralls', require: false
gem 'simplecov', require: false
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 0 additions & 1 deletion curate.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
18 changes: 17 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
4 changes: 3 additions & 1 deletion tasks/curate_tasks.rake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 81802f9

Please sign in to comment.