Skip to content

Commit 8a23a63

Browse files
authored
RUBY-1371 Use a concise instafailing formatter in CI (#4569)
1 parent 32a2afc commit 8a23a63

File tree

5 files changed

+21
-7
lines changed

5 files changed

+21
-7
lines changed

.rspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
--tty
22
--colour
3-
--format <%= ENV["CI"] ? 'progress' : 'Fuubar'%>
3+
--format <%= ENV["CI"] ? 'Rfc::Riff' : 'Fuubar'%>

Gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ group :test do
1010
gem 'rspec-retry'
1111
gem 'benchmark-ips'
1212
gem 'rspec', '~> 3.7'
13+
gem 'fuubar'
14+
gem 'rfc'
1315
platforms :mri do
1416
gem 'timeout-interrupt'
1517
end
16-
gem 'fuubar'
1718
end
1819

1920
group :development, :testing do

gemfiles/driver_master.gemfile

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ group :test do
1111
gem 'rspec-retry'
1212
gem 'benchmark-ips'
1313
gem 'rspec', '~> 3.7'
14+
gem 'fuubar'
15+
gem 'rfc'
1416
platforms :mri do
1517
gem 'timeout-interrupt'
1618
end

gemfiles/rails_master.gemfile

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ group :test do
88
gem 'rspec-retry'
99
gem 'benchmark-ips'
1010
gem 'rspec', '~> 3.7'
11+
gem 'fuubar'
12+
gem 'rfc'
1113
platforms :mri do
1214
gem 'timeout-interrupt'
1315
end

spec/lite_spec_helper.rb

+14-5
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,22 @@
66
require "mongoid"
77
require "rspec"
88

9-
begin
10-
require 'byebug'
11-
rescue LoadError
12-
end
13-
149
require 'support/spec_config'
1510

11+
unless SpecConfig.instance.ci?
12+
begin
13+
require 'byebug'
14+
rescue LoadError
15+
# jruby - try pry
16+
begin
17+
require 'pry'
18+
# jruby likes to raise random error classes, in this case
19+
# NameError in addition to LoadError
20+
rescue Exception
21+
end
22+
end
23+
end
24+
1625
if SpecConfig.instance.mri?
1726
require 'timeout_interrupt'
1827
else

0 commit comments

Comments
 (0)