diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-19 14:07:58 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-19 14:07:58 +0400 |
commit | aca574d0f414821a9a1bbdd0efe53b97cd42ca57 (patch) | |
tree | 3eb331bb74c2265d27c06b52224807805f6c4882 | |
parent | e4bc359841d4254ad46a9e4c9a602cc25b017db1 (diff) |
Ask coveralls to merge results
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r-- | features/support/env.rb | 2 | ||||
-rw-r--r-- | spec/spec_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/features/support/env.rb b/features/support/env.rb index 22f28987fe3..bb4249efe20 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -2,7 +2,7 @@ require 'simplecov' unless ENV['CI'] if ENV['TRAVIS'] require 'coveralls' - Coveralls.wear! + Coveralls.wear_merged! end ENV['RAILS_ENV'] = 'test' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6934cabadfa..81e92a5913a 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -6,7 +6,7 @@ require 'simplecov' unless ENV['CI'] if ENV['TRAVIS'] require 'coveralls' - Coveralls.wear! + Coveralls.wear_merged! end require 'rspec/rails' |