dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump RuboCop to v0.79.x (#7970) 

Merge pull request 7970
This commit is contained in:
Artyom Tokachev 2020-01-15 09:06:31 +03:00 committed by jekyllbot
parent 654d381039
commit 34d0dd6c7d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.rubocop.yml
View File

@ -21,13 +21,13 @@ AllCops:
- script/**/* - script/**/*
- vendor/**/* - vendor/**/*
- tmp/**/* - tmp/**/*
Layout/AlignHash: Layout/HashAlignment:
EnforcedHashRocketStyle: table EnforcedHashRocketStyle: table
Layout/IndentationWidth: Layout/IndentationWidth:
Severity: error Severity: error
Layout/IndentFirstArrayElement: Layout/FirstArrayElementIndentation:
EnforcedStyle: consistent EnforcedStyle: consistent
Layout/IndentFirstHashElement: Layout/FirstHashElementIndentation:
EnforcedStyle: consistent EnforcedStyle: consistent
Layout/MultilineMethodCallIndentation: Layout/MultilineMethodCallIndentation:
EnforcedStyle: indented EnforcedStyle: indented
@ -65,7 +65,7 @@ Metrics/CyclomaticComplexity:
Exclude: Exclude:
- lib/jekyll/utils.rb - lib/jekyll/utils.rb
- lib/jekyll/commands/serve.rb - lib/jekyll/commands/serve.rb
Metrics/LineLength: Layout/LineLength:
Exclude: Exclude:
- !ruby/regexp /features\/.*.rb/ - !ruby/regexp /features\/.*.rb/
- Rakefile - Rakefile

2
Gemfile
View File

@ -27,7 +27,7 @@ group :test do
gem "nokogiri", "~> 1.7" gem "nokogiri", "~> 1.7"
gem "rspec" gem "rspec"
gem "rspec-mocks" gem "rspec-mocks"
gem "rubocop", "~> 0.76.0" gem "rubocop", "~> 0.79.0"
gem "rubocop-performance" gem "rubocop-performance"
gem "test-dependency-theme", :path => File.expand_path("test/fixtures/test-dependency-theme", __dir__) gem "test-dependency-theme", :path => File.expand_path("test/fixtures/test-dependency-theme", __dir__)
gem "test-theme", :path => File.expand_path("test/fixtures/test-theme", __dir__) gem "test-theme", :path => File.expand_path("test/fixtures/test-theme", __dir__)

2
lib/jekyll/excerpt.rb
View File

@ -56,7 +56,7 @@ module Jekyll
# #
# Returns true if the string passed in # Returns true if the string passed in
def include?(something) def include?(something)
(output&.include?(something)) || content.include?(something) output&.include?(something) || content.include?(something)
end end
# The UID for this doc (useful in feeds). # The UID for this doc (useful in feeds).

4
test/test_liquid_renderer.rb
View File

@ -14,13 +14,13 @@ class TestLiquidRenderer < JekyllUnitTest
output = @renderer.stats_table output = @renderer.stats_table
# rubocop:disable Metrics/LineLength # rubocop:disable Layout/LineLength
expected = [ expected = [
%r!^\| Filename\s+|\s+Count\s+|\s+Bytes\s+|\s+Time$!, %r!^\| Filename\s+|\s+Count\s+|\s+Bytes\s+|\s+Time$!,
%r!^\+(?:-+\+){4}$!, %r!^\+(?:-+\+){4}$!,
%r!^\|_posts/2010-01-09-date-override\.markdown\s+|\s+\d+\s+|\s+\d+\.\d{2}K\s+|\s+\d+\.\d{3}$!, %r!^\|_posts/2010-01-09-date-override\.markdown\s+|\s+\d+\s+|\s+\d+\.\d{2}K\s+|\s+\d+\.\d{3}$!,
] ]
# rubocop:enable Metrics/LineLength # rubocop:enable Layout/LineLength
expected.each do |regexp| expected.each do |regexp|
assert_match regexp, output assert_match regexp, output