Skip to content

Commit

Permalink
Merge pull request rubocop#8589 from koic/workaround_jruby_9_2_13_reg…
Browse files Browse the repository at this point in the history
…ression

Workaround for JRuby 9.2.13.0 regression
  • Loading branch information
koic committed Aug 26, 2020
2 parents ad9a74f + 29905d5 commit dea6296
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
4 changes: 3 additions & 1 deletion spec/rubocop/cli_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1563,7 +1563,9 @@ def method(foo, bar, qux, fred, arg5, f) end #{'#' * 85}
''].join("\n"))
end

it 'fails when a configuration file has invalid YAML syntax' do
# FIXME: Remove `broken_on: jruby`, which works around a JRuby 9.2.13.0 regression:
# https://github.com/jruby/jruby/issues/6365
it 'fails when a configuration file has invalid YAML syntax', broken_on: :jruby do
create_file('example/.rubocop.yml', <<~YAML)
AllCops:
Exclude:
Expand Down
4 changes: 4 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,8 @@
if %w[ruby-head-ascii_spec ruby-head-spec].include? ENV['CIRCLE_STAGE']
config.filter_run_excluding broken_on: :ruby_head
end

if %w[jruby-9.2-ascii_spec jruby-9.2-spec].include? ENV['CIRCLE_STAGE']
config.filter_run_excluding broken_on: :jruby
end
end

0 comments on commit dea6296

Please sign in to comment.