merging coverage results w/ coveralls

zlotnika · Jun 27, 2013 · 34c56d7 · 34c56d7
1 parent 528f4dd
commit 34c56d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,8 +1,11 @@
 require 'bundler'
 require 'rspec/core/rake_task'
+require 'coveralls/rake/task'
 
 Bundler::GemHelper.install_tasks
 
+Coveralls::RakeTask.new
+
 RSpec::Core::RakeTask.new(:generators) do |task|
   task.pattern = "spec/generators/**/*_spec.rb"
 end
@@ -11,7 +14,7 @@ RSpec::Core::RakeTask.new(:rolify) do |task|
   task.pattern = "spec/rolify/**/*_spec.rb"
 end
 
-task :default => :spec
+task :default => [ :spec, 'coveralls:push' ]
 
 desc "Run all specs"
 task "spec" do

diff --git a/spec/generators_helper.rb b/spec/generators_helper.rb
@@ -6,7 +6,7 @@
 require 'rails/all'
 
 require 'coveralls'
-Coveralls.wear!
+Coveralls.wear_merged!
 
 module TestApp
   class Application < ::Rails::Application

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -6,7 +6,7 @@
 require 'rails/all'
 
 require 'coveralls'
-Coveralls.wear!
+Coveralls.wear_merged!
 
 ENV['ADAPTER'] ||= 'active_record'