Skip to content

Commit

Permalink
Merge 19e03c9 into e523ee3
Browse files Browse the repository at this point in the history
  • Loading branch information
myronmarston committed Jun 9, 2013
2 parents e523ee3 + 19e03c9 commit 095fd77
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
end

unless ENV['NO_COVERALLS']
begin
require 'simplecov'
require 'coveralls'
Coveralls.wear_merged! do
add_filter '/bundle/'
add_filter '/spec/'
add_filter '/tmp/'
end
rescue Exception => e
warn "Coveralls failed to initialise"
require 'simplecov'
require 'coveralls'
Coveralls.wear! do
add_filter '/bundle/'
add_filter '/spec/'
add_filter '/tmp/'
end
end

Expand Down

0 comments on commit 095fd77

Please sign in to comment.