summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-07 22:22:35 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-07 22:23:13 +0200
commit92a619ad28ae380e5c88c1784bb92f91a7c55bb1 (patch)
tree1b7c1becbed6322537d0c005f63e9a9df124fc14
parent71c8801eefd64d4b2e2f37205b1a5415e3c5bf93 (diff)
downloadgitlab-ce-92a619ad28ae380e5c88c1784bb92f91a7c55bb1.tar.gz
organize simplecov
-rw-r--r--.simplecov4
-rw-r--r--features/support/env.rb5
-rw-r--r--spec/spec_helper.rb5
3 files changed, 6 insertions, 8 deletions
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'