Ask coveralls to merge results

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Ask coveralls to merge results
aca574d0 · Dmitriy Zaporozhets · e4bc3598 · aca574d0 · aca574d0
Unverified Commit aca574d0 authored Sep 19, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

env.rb features/support/env.rb +1 -1

spec_helper.rb spec/spec_helper.rb +1 -1

No files found.
--- 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'

--- 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'