Merge pull request #1598 from bf4/fix_simplecov

Remove dead code preventing simplecov from running

Author: Yohan Robert

Diff for: .travis.yml

@@ -24,7 +24,7 @@ script:
 
 env:
   global:
-    - "JRUBY_OPTS='--dev -J-Xmx1024M'"
+    - "JRUBY_OPTS='--dev -J-Xmx1024M --debug'"
   matrix:
     - "RAILS_VERSION=4.0"
     - "RAILS_VERSION=4.1"

Diff for: test/test_helper.rb

@@ -2,10 +2,6 @@
 
 begin
   require 'simplecov'
-  # HACK: till https://github.com/colszowka/simplecov/pull/400 is merged and released.
-  # Otherwise you may get:
-  # simplecov-0.10.0/lib/simplecov/defaults.rb:50: warning: global variable `$ERROR_INFO' not initialized
-  require 'support/simplecov'
   AppCoverage.start
 rescue LoadError
   STDERR.puts 'Running without SimpleCov'