Merge branch 'fabianrbz-remove_adapters_deprecation_warning'

* fabianrbz-remove_adapters_deprecation_warning:
  Add minitest/profile to profile 10 slowest tests
  Move simplecov_custom_profile to test/ & gate with TRAVIS env
  Remove unused groups from simplecov's profile
  Removes the following deprecation warning: 'method adapters is deprecated. use profiles instead'
This commit is contained in:
Parker Moore 2015-03-01 00:36:48 -08:00
commit 9b962dc565
4 changed files with 19 additions and 7 deletions

View File

@ -19,7 +19,6 @@ gem 'maruku', '~> 0.7.0'
gem 'rdiscount', '~> 2.0' gem 'rdiscount', '~> 2.0'
gem 'launchy', '~> 2.3' gem 'launchy', '~> 2.3'
gem 'simplecov', '~> 0.9' gem 'simplecov', '~> 0.9'
gem 'simplecov-gem-adapter', '~> 1.0.1'
gem 'mime-types', '~> 1.5' gem 'mime-types', '~> 1.5'
gem 'activesupport', '~> 3.2.13' gem 'activesupport', '~> 3.2.13'
gem 'jekyll_test_plugin' gem 'jekyll_test_plugin'
@ -27,6 +26,7 @@ gem 'jekyll_test_plugin_malicious'
gem 'liquid-c', '~> 0.0.3' gem 'liquid-c', '~> 0.0.3'
gem 'minitest' gem 'minitest'
gem 'minitest-reporters' gem 'minitest-reporters'
gem 'minitest-profile'
gem 'test-unit' if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2") gem 'test-unit' if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2")
if ENV['BENCHMARK'] if ENV['BENCHMARK']

View File

@ -20,4 +20,4 @@ fi
set -x set -x
time bundle exec ruby -Ilib -Itest -rloader $TEST_FILES time bundle exec ruby -Ilib -Itest -rloader $TEST_FILES --profile

View File

@ -1,14 +1,16 @@
require 'simplecov' unless ENV['TRAVIS']
require 'simplecov-gem-adapter' require File.expand_path('../simplecov_custom_profile', __FILE__)
SimpleCov.start('gem') do SimpleCov.start('gem') do
add_filter "/vendor/bundle" add_filter "/vendor/bundle"
add_filter "/vendor/gem" add_filter "/vendor/gem"
end
end end
require 'rubygems' require 'rubygems'
require 'ostruct' require 'ostruct'
require 'minitest/autorun' require 'minitest/autorun'
require 'minitest/reporters' require 'minitest/reporters'
require 'minitest/profile'
require 'jekyll' require 'jekyll'

View File

@ -0,0 +1,10 @@
require 'simplecov'
SimpleCov.profiles.define 'gem' do
add_filter '/test/'
add_filter '/features/'
add_filter '/autotest/'
add_group 'Binaries', '/bin/'
add_group 'Libraries', '/lib/'
end