From 4f27e9272862b3f18360045409afb320b85b8232 Mon Sep 17 00:00:00 2001 From: Angela Ebirim Date: Tue, 30 Jul 2013 21:48:06 +0200 Subject: [PATCH 01/12] haha --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 28e42aae..07cacfcf 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [hackety-hack.com][hh.com] is the web backend powering the collaborative features of [Hackety Hack][hh]. It is written in Rails 3 and continues to be under active development (see 'Helping Out'), the switch to Rails 3 happened quite recently so there's still lots to be done. -## Helping Out ## +##### Helping Out ## If you have any experience writing Rails apps, feel free to help out, we're open to pull requests as long as you follow a few conditions. From 626ebdf9a2ef0347fed2e90c41e29c14b21570c7 Mon Sep 17 00:00:00 2001 From: Angela Ebirim Date: Tue, 30 Jul 2013 22:03:10 +0200 Subject: [PATCH 02/12] haha --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07cacfcf..9d92f87a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [hackety-hack.com][hh.com] is the web backend powering the collaborative features of [Hackety Hack][hh]. It is written in Rails 3 and continues to be under active development (see 'Helping Out'), the switch to Rails 3 happened quite recently so there's still lots to be done. -##### Helping Out ## +########### Helping Out ################ If you have any experience writing Rails apps, feel free to help out, we're open to pull requests as long as you follow a few conditions. From 8a39148fe8a35021600f2240d9694d738ed29b28 Mon Sep 17 00:00:00 2001 From: Angela Ebirim Date: Tue, 30 Jul 2013 22:07:56 +0200 Subject: [PATCH 03/12] haha --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9d92f87a..007f21b5 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [hackety-hack.com][hh.com] is the web backend powering the collaborative features of [Hackety Hack][hh]. It is written in Rails 3 and continues to be under active development (see 'Helping Out'), the switch to Rails 3 happened quite recently so there's still lots to be done. -########### Helping Out ################ +### Helping Out ### If you have any experience writing Rails apps, feel free to help out, we're open to pull requests as long as you follow a few conditions. From 83f8808b787ca3d1a76e4f663e1cb8fb81ad252b Mon Sep 17 00:00:00 2001 From: Angela Ebirim Date: Wed, 31 Jul 2013 08:56:23 +0200 Subject: [PATCH 04/12] simplecov in spec_helper.rb file --- spec/spec_helper.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 94e2c1691c960eb6e0e56bd0d69014ffd8a73148 Mon Sep 17 00:00:00 2001 From: Angela Ebirim Date: Wed, 31 Jul 2013 09:04:03 +0200 Subject: [PATCH 05/12] simplecov in env.rb file for cucumber tests --- features/support/env.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/features/support/env.rb b/features/support/env.rb index 07737733..cfb253a6 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -4,6 +4,18 @@ # 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' # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In From 20cb47845edbfbae5c307627e4aae0dede613efa Mon Sep 17 00:00:00 2001 From: Angela Ebirim Date: Thu, 1 Aug 2013 01:43:37 +0200 Subject: [PATCH 06/12] this is test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 007f21b5..fef30cc9 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [hackety-hack.com][hh.com] is the web backend powering the collaborative features of [Hackety Hack][hh]. It is written in Rails 3 and continues to be under active development (see 'Helping Out'), the switch to Rails 3 happened quite recently so there's still lots to be done. -### Helping Out ### +###### Helping Out ### If you have any experience writing Rails apps, feel free to help out, we're open to pull requests as long as you follow a few conditions. From f2fe28795bddca5bc52a3947f4ed7422e4ca0e47 Mon Sep 17 00:00:00 2001 From: Angela Ebirim Date: Fri, 2 Aug 2013 11:48:52 +0200 Subject: [PATCH 07/12] new env.rb withapp directory inc. --- features/support/env.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/features/support/env.rb b/features/support/env.rb index cfb253a6..5b198353 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -13,7 +13,8 @@ add_filter '/config/' add_filter '/lib/' add_filter '/vendor/' - add_filter '/app/' + #add_filter '/app/' + end require 'cucumber/rails' From 9d1f1c4e6c92b390045a9abbeb2d2f17ed9edd25 Mon Sep 17 00:00:00 2001 From: Angela Ebirim Date: Fri, 2 Aug 2013 16:00:34 +0200 Subject: [PATCH 08/12] new env.rb file --- features/support/env.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/support/env.rb b/features/support/env.rb index 5b198353..a348b10b 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -3,7 +3,7 @@ # 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 From b73c3fdd97d02e8427d8a5733ddcb4d6dbb15007 Mon Sep 17 00:00:00 2001 From: Angela Ebirim Date: Fri, 2 Aug 2013 16:13:59 +0200 Subject: [PATCH 09/12] amended Gemfile with simplecov --- Gemfile | 4 ++++ 1 file changed, 4 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" From 02b1cc146c04c16e667b584f5374782689cbfbac Mon Sep 17 00:00:00 2001 From: Angela Ebirim Date: Mon, 5 Aug 2013 11:56:07 +0200 Subject: [PATCH 10/12] amended gemfile with simplecov --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 75c53643..b20cfde0 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ group :development, :test do end group :production do - gem 'pg' # ugh heroku + gem 'pg' # ugh heroku.. end group :test do From ba814acc42c7bb53bf98eef5c19a2f9f44c4aa77 Mon Sep 17 00:00:00 2001 From: Angela Ebirim Date: Mon, 5 Aug 2013 12:17:22 +0200 Subject: [PATCH 11/12] spec helper file with simplecov gem --- Gemfile.lock | 6 ++++++ spec/spec_helper.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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/spec/spec_helper.rb b/spec/spec_helper.rb index 629dc4e5..94e2daa5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -15,7 +15,7 @@ require 'capybara/rspec' # Requires supporting ruby files with custom matchers and macros, etc, -# in spec/support/ and its subdirectories. +# in spec/support/ and its subdirectories Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f} RSpec.configure do |config| From 0baac886c17b99ca7b206fcefaa99c126684c52c Mon Sep 17 00:00:00 2001 From: Angela Ebirim Date: Mon, 5 Aug 2013 12:38:59 +0200 Subject: [PATCH 12/12] env file with simplecov gem --- features/support/env.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/support/env.rb b/features/support/env.rb index a348b10b..9a68a912 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -2,7 +2,7 @@ # It is recommended to regenerate this file in the future when you upgrade to a # 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. +# files.. # require 'simplecov'