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

Merge pull request #1598 from bf4/fix_simplecov

Browse Source 
Remove dead code preventing simplecov from running
This commit is contained in:
Yohan Robert 2016-03-19 01:54:53 +01:00
commit 61412d80ca
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

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

4
test/test_helper.rb
View File

@ -2,10 +2,6 @@ require 'bundler/setup'
begin begin
require 'simplecov' 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 AppCoverage.start
rescue LoadError rescue LoadError
STDERR.puts 'Running without SimpleCov' STDERR.puts 'Running without SimpleCov'