Skip to content

Commit 942bbfe

Browse files
committed
Update simplecov dependency to >= 0.9
1 parent 067f663 commit 942bbfe

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

.travis.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
bundler_args: --without development
22
language: ruby
3+
env:
4+
global:
5+
- JRUBY_OPTS="$JRUBY_OPTS --debug"
36
rvm:
47
- 1.8.7
58
- 1.9.2
69
- 1.9.3
710
- 2.0.0
8-
- 2.1.2
11+
- 2.1
12+
- jruby-18mode
13+
- jruby-19mode
14+
- jruby-head
915
- rbx-2
1016
- ruby-head
1117
matrix:
12-
include:
13-
- rvm: jruby-18mode
14-
env: JRUBY_OPTS="$JRUBY_OPTS --debug"
15-
- rvm: jruby-19mode
16-
env: JRUBY_OPTS="$JRUBY_OPTS --debug"
17-
- rvm: jruby-head
18-
env: JRUBY_OPTS="$JRUBY_OPTS --debug"
1918
allow_failures:
2019
- rvm: 1.9.2
2120
- rvm: jruby-18mode

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ end
1414

1515
group :test do
1616
gem 'childlabor'
17-
gem 'coveralls', '>= 0.5.7', :require => false
17+
gem 'coveralls', '>= 0.5.7'
1818
gem 'fakeweb', '>= 1.3'
1919
gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
2020
gem 'rspec', '>= 3'
2121
gem 'rspec-mocks', '>= 3'
2222
gem 'rubocop', '>= 0.19', :platforms => [:ruby_19, :ruby_20, :ruby_21]
23-
gem 'simplecov', :require => false
23+
gem 'simplecov', '>= 0.9'
2424
gem 'rest-client', '~> 1.6.0', :platforms => [:jruby, :ruby_18]
2525
end
2626

spec/helper.rb

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
$TESTING = true
22

3-
require "simplecov"
4-
require "coveralls"
3+
if RUBY_VERSION >= '1.9'
4+
require "simplecov"
5+
require "coveralls"
56

6-
SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
7-
SimpleCov::Formatter::HTMLFormatter,
8-
Coveralls::SimpleCov::Formatter
9-
]
7+
SimpleCov.formatters = [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
108

11-
SimpleCov.start do
12-
add_filter "/spec/"
13-
minimum_coverage(92.21)
9+
SimpleCov.start do
10+
add_filter "/spec"
11+
minimum_coverage(92.21)
12+
end
1413
end
1514

1615
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))

0 commit comments

Comments
 (0)