From 50cf3ee3ba3241088ab8956243a91e62d9a95e58 Mon Sep 17 00:00:00 2001
From: Angela Ebirim <cebirim@gmail.com>
Date: Wed, 31 Jul 2013 08:56:23 +0200
Subject: [PATCH 1/2] Added simplecov to the project

* included in Gemfile
* added filters for both cucumber and RSpec
---
 Gemfile                 |  4 ++++
 features/support/env.rb | 13 +++++++++++++
 spec/spec_helper.rb     | 12 ++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/Gemfile b/Gemfile
index 50f8b79d..75c53643 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,10 +42,13 @@ end
 group :development, :test do
   gem 'fabrication'
   gem 'rspec-rails'
+  gem 'capybara'
   gem 'cucumber-rails', require: false
   gem "faker"
   gem 'pry'
   gem 'sqlite3'
+  
+  
 end
 
 group :production do
@@ -53,6 +56,7 @@ group :production do
 end
 
 group :test do
+  gem "simplecov", :require => false
   gem "mocha"
   gem "database_cleaner"
   gem "launchy"
diff --git a/features/support/env.rb b/features/support/env.rb
index 07737733..a348b10b 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -3,6 +3,19 @@
 # newer version of cucumber-rails. Consider adding your own code to a new file 
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
+#
+
+require 'simplecov'
+SimpleCov.start do
+coverage_dir ('public/publix')
+ #add_filter '/features/'
+ add_filter '/spec/'
+ add_filter '/config/'
+ add_filter '/lib/'
+ add_filter '/vendor/'
+ #add_filter '/app/'
+
+end
 
 require 'cucumber/rails'
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 79d1f541..629dc4e5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,7 +1,18 @@
+require 'simplecov'
+SimpleCov.start do
+ coverage_dir('public/publix')
+#add_filter '/spec/'
+ add_filter '/config/'
+ add_filter '/lib/'
+ add_filter '/vendor/'
+ add_filter '/features/'
+end
+
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 require 'database_cleaner'
+require 'capybara/rspec'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -28,4 +39,5 @@
   config.before(:each) { reset_email }
 
   config.include Devise::TestHelpers, :type => :controller
+  config.include Capybara::DSL 
 end

From 273a1a7c91d637ef7b8f270941484ca229807fae Mon Sep 17 00:00:00 2001
From: Tobias Pfeiffer <tobias.pfeiffer@student.hpi.uni-potsdam.de>
Date: Sun, 4 Aug 2013 14:15:07 +0200
Subject: [PATCH 2/2] Finished up simplecov integration

* new updated Gemfile.lock
* removed lib from the filtered dirs as imo it should be covered
* using the standard coverage directory
---
 .gitignore              |  1 +
 Gemfile.lock            |  6 ++++++
 features/support/env.rb | 11 +++--------
 spec/spec_helper.rb     |  9 +++------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8af1da5b..f3bc277a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ tmp/
 *.swp
 .redcar
 bin/
+coverage
diff --git a/Gemfile.lock b/Gemfile.lock
index 7ffccfa5..8424216a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -202,6 +202,10 @@ GEM
       ffi (~> 1.0.9)
       multi_json (~> 1.0.4)
       rubyzip
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     slop (2.4.3)
     sprockets (2.0.4)
       hike (~> 1.2)
@@ -234,6 +238,7 @@ PLATFORMS
 DEPENDENCIES
   bson_ext
   cancan
+  capybara
   coffee-rails (~> 3.1.0)
   cucumber-rails
   database_cleaner
@@ -257,6 +262,7 @@ DEPENDENCIES
   sass-rails (~> 3.1.0)
   semantic_menu!
   simple_form!
+  simplecov
   sqlite3
   uglifier
   unicorn
diff --git a/features/support/env.rb b/features/support/env.rb
index a348b10b..78880136 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -7,14 +7,9 @@
 
 require 'simplecov'
 SimpleCov.start do
-coverage_dir ('public/publix')
- #add_filter '/features/'
- add_filter '/spec/'
- add_filter '/config/'
- add_filter '/lib/'
- add_filter '/vendor/'
- #add_filter '/app/'
-
+  add_filter '/spec/'
+  add_filter '/config/'
+  add_filter '/vendor/'
 end
 
 require 'cucumber/rails'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 629dc4e5..9a181a89 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,11 +1,8 @@
 require 'simplecov'
 SimpleCov.start do
- coverage_dir('public/publix')
-#add_filter '/spec/'
- add_filter '/config/'
- add_filter '/lib/'
- add_filter '/vendor/'
- add_filter '/features/'
+  add_filter '/config/'
+  add_filter '/vendor/'
+  add_filter '/features/'
 end
 
 ENV["RAILS_ENV"] ||= 'test'