Coveralls merge

badges · Jan 23, 2014 · afd4da5 · afd4da5
1 parent 4fa7962
commit afd4da5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,9 +1,10 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
+require 'coveralls/rake/task'
 
+Coveralls::RakeTask.new
 RSpec::Core::RakeTask.new
 Cucumber::Rake::Task.new
 
-task :default => [:spec, :cucumber]
+task :default => [:spec, :cucumber, 'coveralls:push']
diff --git a/features/support/env.rb b/features/support/env.rb
@@ -2,3 +2,5 @@
 require 'aruba-doubles/cucumber'
 require 'badger/badger'
 
+require 'coveralls'
+Coveralls.wear_merged!
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,7 +1,7 @@
 require 'badger'
 
 require 'coveralls'
-Coveralls.wear!
+Coveralls.wear_merged!
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.