ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-24 14:56:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1505 from bf4/simplecov_fix

Browse Source 
Update SimpleCov; remove compatibility patch
This commit is contained in:
Benjamin Fleischer 2016-02-09 21:55:03 -06:00
commit eedf0b64a4
4 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.simplecov
View File

@ -19,7 +19,6 @@ ENV['FULL_BUILD'] ||= ENV['CI']
# rubocop:enable Style/DoubleNegation # rubocop:enable Style/DoubleNegation
## CONFIGURE SIMPLECOV ## CONFIGURE SIMPLECOV
SimpleCov.pid = $$ # In case there's any forking
SimpleCov.profiles.define 'app' do SimpleCov.profiles.define 'app' do
coverage_dir 'coverage' coverage_dir 'coverage'

1
Gemfile
View File

@ -41,7 +41,6 @@ group :test do
gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
gem 'codeclimate-test-reporter', require: false gem 'codeclimate-test-reporter', require: false
gem 'simplecov', '~> 0.10', require: false, group: :development
end end
group :development, :test do group :development, :test do

1
active_model_serializers.gemspec
View File

@ -51,6 +51,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'will_paginate', '~> 3.0', '>= 3.0.7' spec.add_development_dependency 'will_paginate', '~> 3.0', '>= 3.0.7'
spec.add_development_dependency 'bundler', '~> 1.6' 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 'timecop', '~> 0.7'
spec.add_development_dependency 'minitest-reporters' spec.add_development_dependency 'minitest-reporters'
spec.add_development_dependency 'grape', ['>= 0.13', '< 1.0'] spec.add_development_dependency 'grape', ['>= 0.13', '< 1.0']

6
test/support/simplecov.rb
View File

@ -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