Skip to content

G
gitlab-ce
Commit aca574d0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Ask coveralls to merge results 

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent e4bc3598
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
features/support/env.rb
View file @ aca574d0
...@@ -2,7 +2,7 @@ require 'simplecov' unless ENV['CI'] ...@@ -2,7 +2,7 @@ require 'simplecov' unless ENV['CI']
if ENV['TRAVIS'] if ENV['TRAVIS']
require 'coveralls' require 'coveralls'
Coveralls.wear! Coveralls.wear_merged!
end end
ENV['RAILS_ENV'] = 'test' ENV['RAILS_ENV'] = 'test'
......
spec/spec_helper.rb
View file @ aca574d0
...@@ -6,7 +6,7 @@ require 'simplecov' unless ENV['CI'] ...@@ -6,7 +6,7 @@ require 'simplecov' unless ENV['CI']
if ENV['TRAVIS'] if ENV['TRAVIS']
require 'coveralls' require 'coveralls'
Coveralls.wear! Coveralls.wear_merged!
end end
require 'rspec/rails' require 'rspec/rails'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7