Skip to content

Commit ff3b8cf

Browse files
author
Petr Chalupa
committed
Merge pull request #302 from pitr-ch/master
Make coverage opt in rather then opt out
2 parents 3f411e0 + 75e5a0a commit ff3b8cf

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ end
1919
group :testing do
2020
gem 'rspec', '~> 3.2.0'
2121
gem 'timecop', '~> 0.7.3'
22-
end
2322

24-
group :coverage do
23+
# Coverage
2524
gem 'simplecov', '~> 0.10.0', :require => false
2625
gem 'coveralls', '~> 0.8.1', :require => false
2726
end

spec/spec_helper.rb

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
begin
1+
$VERBOSE = nil # suppress our deprecation warnings
2+
require 'concurrent'
3+
require 'concurrent-edge'
4+
5+
logger = Logger.new($stderr)
6+
logger.level = Logger::WARN
7+
Concurrent.global_logger = lambda do |level, progname, message = nil, &block|
8+
logger.add level, message, progname, &block
9+
end
10+
11+
if ENV['COVERAGE'] || ENV['CI'] || ENV['TRAVIS']
212
require 'simplecov'
313
require 'coveralls'
414

@@ -19,17 +29,6 @@
1929
add_filter '/yard-template/'
2030
add_filter '/yardoc/'
2131
end
22-
rescue LoadError
23-
end
24-
25-
$VERBOSE = nil # suppress our deprecation warnings
26-
require 'concurrent'
27-
require 'concurrent-edge'
28-
29-
logger = Logger.new($stderr)
30-
logger.level = Logger::WARN
31-
Concurrent.global_logger = lambda do |level, progname, message = nil, &block|
32-
logger.add level, message, progname, &block
3332
end
3433

3534
# import all the support files

0 commit comments

Comments
 (0)