From 92a619ad28ae380e5c88c1784bb92f91a7c55bb1 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 7 Jan 2013 22:22:35 +0200
Subject: [PATCH] organize simplecov

---
 .simplecov              | 4 ++++
 features/support/env.rb | 5 +----
 spec/spec_helper.rb     | 5 +----
 3 files changed, 6 insertions(+), 8 deletions(-)
 create mode 100644 .simplecov

diff --git a/.simplecov b/.simplecov
new file mode 100644
index 00000000000..d979288df44
--- /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 1f75d84954a..72531718e0c 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 a1331fa79db..edabcc33625 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'
-- 
GitLab