From b08ef47eb2a167608e09f723c30ae07263389471 Mon Sep 17 00:00:00 2001 From: Tobias Pfeiffer Date: Sun, 4 Aug 2013 14:46:58 +0200 Subject: [PATCH 1/2] Added coveralls gem and formatter --- Gemfile | 1 + Gemfile.lock | 10 ++++++++++ features/support/env.rb | 7 +++++++ spec/spec_helper.rb | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/Gemfile b/Gemfile index 75c53643..2da394ff 100644 --- a/Gemfile +++ b/Gemfile @@ -57,6 +57,7 @@ end group :test do gem "simplecov", :require => false + gem "coveralls" gem "mocha" gem "database_cleaner" gem "launchy" diff --git a/Gemfile.lock b/Gemfile.lock index 8424216a..30114443 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -68,6 +68,13 @@ GEM coffee-script-source execjs coffee-script-source (1.2.0) + colorize (0.5.8) + coveralls (0.5.8) + colorize + json + rest-client + simplecov (>= 0.7) + thor cucumber (1.1.4) builder (>= 2.1.2) diff-lcs (>= 1.1.2) @@ -177,6 +184,8 @@ GEM json (~> 1.4) redcarpet (2.1.0) responders (0.6.5) + rest-client (1.6.7) + mime-types (>= 1.16) rspec (2.8.0) rspec-core (~> 2.8.0) rspec-expectations (~> 2.8.0) @@ -240,6 +249,7 @@ DEPENDENCIES cancan capybara coffee-rails (~> 3.1.0) + coveralls cucumber-rails database_cleaner devise (~> 2.2.2) diff --git a/features/support/env.rb b/features/support/env.rb index 78880136..3100ba3e 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -6,6 +6,13 @@ # require 'simplecov' +require 'coveralls' + +SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ + Coveralls::SimpleCov::Formatter, + SimpleCov::Formatter::HTMLFormatter +] + SimpleCov.start do add_filter '/spec/' add_filter '/config/' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9a181a89..af24fb25 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,10 @@ require 'simplecov' +require 'coveralls' + +SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ + Coveralls::SimpleCov::Formatter, + SimpleCov::Formatter::HTMLFormatter +] SimpleCov.start do add_filter '/config/' add_filter '/vendor/' From 2c16a7e2b92041cb0378296aae14f47e5d44c236 Mon Sep 17 00:00:00 2001 From: Tobias Pfeiffer Date: Sun, 4 Aug 2013 14:52:09 +0200 Subject: [PATCH 2/2] I hate duplication so there now is unified code_coverage file that cucumber and rspec load --- features/support/env.rb | 14 +------------- spec/code_coverage.rb | 11 +++++++++++ spec/spec_helper.rb | 13 +------------ 3 files changed, 13 insertions(+), 25 deletions(-) create mode 100644 spec/code_coverage.rb diff --git a/features/support/env.rb b/features/support/env.rb index 3100ba3e..ee6880e7 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -5,19 +5,7 @@ # files. # -require 'simplecov' -require 'coveralls' - -SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ - Coveralls::SimpleCov::Formatter, - SimpleCov::Formatter::HTMLFormatter -] - -SimpleCov.start do - add_filter '/spec/' - add_filter '/config/' - add_filter '/vendor/' -end +require_relative '../../spec/code_coverage' require 'cucumber/rails' diff --git a/spec/code_coverage.rb b/spec/code_coverage.rb new file mode 100644 index 00000000..170631c4 --- /dev/null +++ b/spec/code_coverage.rb @@ -0,0 +1,11 @@ +require 'simplecov' +require 'coveralls' + +SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ + Coveralls::SimpleCov::Formatter, + SimpleCov::Formatter::HTMLFormatter +] +SimpleCov.start do + add_filter '/config/' + add_filter '/vendor/' +end \ No newline at end of file diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index af24fb25..d80bdb02 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,15 +1,4 @@ -require 'simplecov' -require 'coveralls' - -SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ - Coveralls::SimpleCov::Formatter, - SimpleCov::Formatter::HTMLFormatter -] -SimpleCov.start do - add_filter '/config/' - add_filter '/vendor/' - add_filter '/features/' -end +require 'code_coverage' ENV["RAILS_ENV"] ||= 'test' require File.expand_path("../../config/environment", __FILE__)