organize simplecov

92a619ad · Dmitriy Zaporozhets · 71c8801e · 92a619ad · 92a619ad · 92a619ad
Commit 92a619ad authored Jan 07, 2013 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 8 deletions

.simplecov .simplecov +4 -0

features/support/env.rb features/support/env.rb +1 -4

spec/spec_helper.rb spec/spec_helper.rb +1 -4

No files found.
--- a/.simplecov
+++ b/.simplecov
+# .simplecov
+SimpleCov.start 'rails' do
+  merge_timeout 3600
+end
--- a/features/support/env.rb
+++ b/features/support/env.rb
-unless ENV['CI']
+require 'simplecov' unless ENV['CI']
-  require 'simplecov'
-  SimpleCov.start 'rails'
-end
 ENV['RAILS_ENV'] = 'test'
 require './config/environment'

--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
-unless ENV['CI']
+require 'simplecov' unless ENV['CI']
-  require 'simplecov'
-  SimpleCov.start 'rails'
-end
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'