From 80a6bcbca2bcd1ef1f6c6a528ba9547c40406c78 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Fri, 5 Feb 2016 15:35:06 +0800 Subject: [PATCH] remove annoying rcov gem --- .simplecov | 4 ---- Gemfile | 1 - Gemfile.lock | 3 --- bin/jenkins-test.sh | 5 +++-- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.simplecov b/.simplecov index deb2c46e..b81ebfeb 100644 --- a/.simplecov +++ b/.simplecov @@ -1,7 +1,3 @@ -if ENV['COVERAGE_FORMATTER'] == 'rcov' - require 'simplecov-rcov' - SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter -end if ENV['COVERAGE'] == 'on' SimpleCov.start 'rails' end diff --git a/Gemfile b/Gemfile index c00a87f9..b8872752 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,6 @@ group :test do gem 'factory_girl_rails' gem 'shoulda-matchers' gem 'simplecov', require: false - gem 'simplecov-rcov' end group :production do #this is used on heroku diff --git a/Gemfile.lock b/Gemfile.lock index f26652ce..710f5f10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -209,8 +209,6 @@ GEM json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - simplecov-rcov (0.2.3) - simplecov (>= 0.4.1) slop (3.6.0) sprockets (3.4.0) rack (> 1, < 3) @@ -267,7 +265,6 @@ DEPENDENCIES sass-rails shoulda-matchers simplecov - simplecov-rcov tunemygc uglifier uservoice-ruby diff --git a/bin/jenkins-test.sh b/bin/jenkins-test.sh index 511899c7..f9059d30 100755 --- a/bin/jenkins-test.sh +++ b/bin/jenkins-test.sh @@ -1,7 +1,8 @@ #!/bin/bash -l # jenkins machine prerequisites -#sudo aptitude -q -y install libpq-dev +# sudo aptitude -q -y install libpq-dev +# install rvm with user gemsets source "$HOME/.rvm/scripts/rvm" rvm use $(cat .ruby-version) || \ @@ -21,4 +22,4 @@ sed -i -e "s/DB_USERNAME='.*'/DB_USERNAME='jenkins'/" .env #test bundle install rake db:create db:test:prepare -COVERAGE=on COVERAGE_FORMATTER=rcov bundle exec rspec +COVERAGE=on bundle exec rspec