Skip to content

Commit 14a06d9

Browse files
committed
Only capture stderr on Ruby 2.1 on CI
Always show warnings in tests
1 parent e5a1098 commit 14a06d9

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ cache:
88
rvm:
99
- 1.9.3
1010
- 2.0.0
11-
- 2.1
1211
- 2.2
1312
- ruby-head
1413
- rbx-2
@@ -17,7 +16,7 @@ install:
1716
- bundle install --retry=3
1817

1918
script:
20-
- env CAPTURE_STDERR=false bundle exec rake ci
19+
- env CAPTURE_STDERR=${CAPTURE_STDERR:-false} bundle exec rake ci
2120

2221
env:
2322
- "RAILS_VERSION=4.0"
@@ -27,6 +26,8 @@ env:
2726

2827
matrix:
2928
include:
29+
- rvm: 2.1
30+
env: CAPTURE_STDERR=true
3031
- rvm: jruby-19mode
3132
env: JRUBY_OPTS='--server -Xcompile.invokedynamic=false -Xcli.debug=true --debug'
3233
allow_failures:

test/test_helper.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ def Minitest.after_run(&block)
4949
if ENV['CAPTURE_STDERR'] !~ /false|1/i
5050
require 'capture_warnings'
5151
CaptureWarnings.new(_fail_build = true).execute!
52+
else
53+
$VERBOSE = true
5254
end
5355

5456
require 'active_model_serializers'

0 commit comments

Comments
 (0)