diff --git a/.simplecov b/.simplecov index 616df8047..955a60606 100644 --- a/.simplecov +++ b/.simplecov @@ -19,7 +19,6 @@ ENV['FULL_BUILD'] ||= ENV['CI'] # rubocop:enable Style/DoubleNegation ## CONFIGURE SIMPLECOV -SimpleCov.pid = $$ # In case there's any forking SimpleCov.profiles.define 'app' do coverage_dir 'coverage' diff --git a/Gemfile b/Gemfile index 9a386356f..9f9282b56 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,6 @@ group :test do gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby gem 'codeclimate-test-reporter', require: false - gem 'simplecov', '~> 0.10', require: false, group: :development end group :development, :test do diff --git a/active_model_serializers.gemspec b/active_model_serializers.gemspec index 2f5def5a2..7febe8091 100644 --- a/active_model_serializers.gemspec +++ b/active_model_serializers.gemspec @@ -51,6 +51,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'will_paginate', '~> 3.0', '>= 3.0.7' spec.add_development_dependency 'bundler', '~> 1.6' + spec.add_development_dependency 'simplecov', '~> 0.11' spec.add_development_dependency 'timecop', '~> 0.7' spec.add_development_dependency 'minitest-reporters' spec.add_development_dependency 'grape', ['>= 0.13', '< 1.0'] diff --git a/test/support/simplecov.rb b/test/support/simplecov.rb deleted file mode 100644 index 2a249972d..000000000 --- a/test/support/simplecov.rb +++ /dev/null @@ -1,6 +0,0 @@ -# https://github.com/colszowka/simplecov/pull/400 -# https://github.com/ruby/ruby/blob/trunk/lib/English.rb -unless defined?(English) - # The exception object passed to +raise+. - alias $ERROR_INFO $! # rubocop:disable Style/SpecialGlobalVars -end