Skip to content

Commit

Permalink
Coveralls handles multiple Travis builds.
Browse files Browse the repository at this point in the history
There's no need to use the merged support from Coveralls since they
already handle receiving data from multiple Travis builds and
combining that.
  • Loading branch information
wbyoung committed Nov 11, 2013
1 parent 2ce9e16 commit 804ff8c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
5 changes: 1 addition & 4 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,12 @@ Bundler::GemHelper.install_tasks

require 'rspec/core'
require 'rspec/core/rake_task'
require 'coveralls/rake/task'

Coveralls::RakeTask.new

RSpec::Core::RakeTask.new(:spec) do |spec|
spec.pattern = FileList['spec/**/*_spec.rb']
end

task :default => ["spec:all", "coveralls:push"]
task :default => "spec:all"

namespace :spec do
%w(active_record_edge active_record_40 active_record_32 active_record_31 active_record_30 data_mapper_12 mongoid_31 mongoid_30 mongoid_24 mongo_mapper sinatra_13 sinatra_14).each do |gemfile|
Expand Down
9 changes: 5 additions & 4 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
require 'coveralls'

# Enable Coveralls
Coveralls.wear!

$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
$LOAD_PATH.unshift(File.dirname(__FILE__))

Expand All @@ -11,10 +16,6 @@

require 'capybara/rspec'
require 'database_cleaner'
require 'coveralls'

# Enable Coveralls
Coveralls.wear_merged!

# Simulate a gem providing a subclass of ActiveRecord::Base before the Railtie is loaded.
require 'fake_gem' if defined? ActiveRecord
Expand Down

0 comments on commit 804ff8c

Please sign in to comment.