merge coveralls

rspec · Jun 8, 2013 · c1de4a8 · c1de4a8
1 parent d36e526
commit c1de4a8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/features/support/env.rb b/features/support/env.rb
@@ -12,7 +12,11 @@
   end
 end if RUBY_PLATFORM == 'java'
 
-require 'coveralls'
-Coveralls.wear! do
-  add_filter '/bundle/'
+begin
+  require 'coveralls'
+  Coveralls.wear_merged! do
+    add_filter '/bundle/'
+  end
+rescue Exception => e
+  warn "Coveralls disabled"
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,7 +1,11 @@
-require 'simplecov' if RUBY_VERSION.to_f > 1.8
-require 'coveralls'
-Coveralls.wear! do
-  add_filter '/bundle/'
+begin
+  require 'simplecov'
+  require 'coveralls'
+  Coveralls.wear_merged! do
+    add_filter '/bundle/'
+  end
+rescue Exception => e
+  warn "Coveralls disabled"
 end
 
 Dir['./spec/support/**/*'].each {|f| require f}