Skip to content

Commit

Permalink
RUBY-1371 Use a concise instafailing formatter in CI (#4569)
Browse files Browse the repository at this point in the history
  • Loading branch information
p-mongo authored Nov 26, 2018
1 parent 32a2afc commit 8a23a63
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .rspec
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
--tty
--colour
--format <%= ENV["CI"] ? 'progress' : 'Fuubar'%>
--format <%= ENV["CI"] ? 'Rfc::Riff' : 'Fuubar'%>
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ group :test do
gem 'rspec-retry'
gem 'benchmark-ips'
gem 'rspec', '~> 3.7'
gem 'fuubar'
gem 'rfc'
platforms :mri do
gem 'timeout-interrupt'
end
gem 'fuubar'
end

group :development, :testing do
Expand Down
2 changes: 2 additions & 0 deletions gemfiles/driver_master.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ group :test do
gem 'rspec-retry'
gem 'benchmark-ips'
gem 'rspec', '~> 3.7'
gem 'fuubar'
gem 'rfc'
platforms :mri do
gem 'timeout-interrupt'
end
Expand Down
2 changes: 2 additions & 0 deletions gemfiles/rails_master.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ group :test do
gem 'rspec-retry'
gem 'benchmark-ips'
gem 'rspec', '~> 3.7'
gem 'fuubar'
gem 'rfc'
platforms :mri do
gem 'timeout-interrupt'
end
Expand Down
19 changes: 14 additions & 5 deletions spec/lite_spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,22 @@
require "mongoid"
require "rspec"

begin
require 'byebug'
rescue LoadError
end

require 'support/spec_config'

unless SpecConfig.instance.ci?
begin
require 'byebug'
rescue LoadError
# jruby - try pry
begin
require 'pry'
# jruby likes to raise random error classes, in this case
# NameError in addition to LoadError
rescue Exception
end
end
end

if SpecConfig.instance.mri?
require 'timeout_interrupt'
else
Expand Down

0 comments on commit 8a23a63

Please sign in to comment.