Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit 87fb8b5

Browse files
authored
Merge pull request #3122 from rspec/fix-build
Fix the build by relaxing rubocop rule
2 parents 765cfca + 9f53fec commit 87fb8b5

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

Gemfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ elsif RUBY_VERSION < '2.0'
5959
gem 'ffi', '< 1.9.19' # ffi dropped Ruby 1.8 support in 1.9.19
6060
elsif RUBY_VERSION < '2.3.0'
6161
gem 'ffi', '~> 1.12.0'
62-
else
62+
elsif RUBY_VERSION < '2.6.0'
6363
gem 'ffi', '~> 1.15.0'
64+
else
65+
gem 'ffi', '~> 1.17.0'
6466
end
6567

6668
if RUBY_VERSION < '2.3.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)

lib/rspec/core/formatters/exception_presenter.rb

+5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ module Formatters
1111
class ExceptionPresenter
1212
attr_reader :exception, :example, :description, :message_color,
1313
:detail_formatter, :extra_detail_formatter, :backtrace_formatter
14+
15+
# We want private attr_reader but that issues a warning on older rubies, refactor later
16+
#
17+
# rubocop:disable Style/AccessModifierDeclarations
1418
private :message_color, :detail_formatter, :extra_detail_formatter, :backtrace_formatter
19+
# rubocop:enable Style/AccessModifierDeclarations
1520

1621
def initialize(exception, example, options={})
1722
@exception = exception

0 commit comments

Comments
 (0)