diff --git a/Gemfile b/Gemfile index 50f8b79d..b20cfde0 100644 --- a/Gemfile +++ b/Gemfile @@ -42,17 +42,21 @@ 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 - gem 'pg' # ugh heroku + gem 'pg' # ugh heroku.. end group :test do + gem "simplecov", :require => false gem "mocha" gem "database_cleaner" gem "launchy" 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/README.md b/README.md index 28e42aae..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. diff --git a/features/support/env.rb b/features/support/env.rb index 07737733..9a68a912 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -2,7 +2,20 @@ # 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' +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..94e2daa5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,10 +1,21 @@ +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. +# in spec/support/ and its subdirectories Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f} RSpec.configure do |config| @@ -28,4 +39,5 @@ config.before(:each) { reset_email } config.include Devise::TestHelpers, :type => :controller + config.include Capybara::DSL end