From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 7 Jan 2013 20:22:35 +0000 (+0200)
Subject: organize simplecov
X-Git-Tag: v4.1.0~118
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=92a619ad28ae380e5c88c1784bb92f91a7c55bb1;p=wvm%2Fgitlab.git

organize simplecov
---

diff --git a/.simplecov b/.simplecov
new file mode 100644
index 000000000..d979288df
--- /dev/null
+++ b/.simplecov
@@ -0,0 +1,4 @@
+# .simplecov
+SimpleCov.start 'rails' do
+  merge_timeout 3600
+end
diff --git a/features/support/env.rb b/features/support/env.rb
index 1f75d8495..72531718e 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -1,7 +1,4 @@
-unless ENV['CI']
-  require 'simplecov'
-  SimpleCov.start 'rails'
-end
+require 'simplecov' unless ENV['CI']
 
 ENV['RAILS_ENV'] = 'test'
 require './config/environment'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a1331fa79..edabcc336 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,7 +1,4 @@
-unless ENV['CI']
-  require 'simplecov'
-  SimpleCov.start 'rails'
-end
+require 'simplecov' unless ENV['CI']
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'