diff --git a/Gemfile b/Gemfile index e521f771d..bf8723a45 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ group :test do gem "nokogiri", "~> 1.7" gem "rspec" gem "rspec-mocks" - gem "rubocop", "~> 1.18.3" + gem "rubocop", "~> 1.22.0" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rake" diff --git a/test/test_collections.rb b/test/test_collections.rb index 2a03c8ab9..65b4b7098 100644 --- a/test/test_collections.rb +++ b/test/test_collections.rb @@ -130,6 +130,7 @@ class TestCollections < JekyllUnitTest assert @site.collections["methods"].docs.is_a? Array @site.collections["methods"].docs.each do |doc| assert doc.is_a? Jekyll::Document + # rubocop:disable Style/WordArray assert_includes %w( _methods/configuration.md _methods/sanitized_path.md @@ -142,6 +143,7 @@ class TestCollections < JekyllUnitTest _methods/3940394-21-9393050-fifif1323-test.md _methods/trailing-dots...md ), doc.relative_path + # rubocop:enable Style/WordArray end end diff --git a/test/test_site.rb b/test/test_site.rb index 41990ee65..c3f241d10 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -241,6 +241,7 @@ class TestSite < JekyllUnitTest @site.process # exclude files in symlinked directories here and insert them in the # following step when not on Windows. + # rubocop:disable Style/WordArray sorted_pages = %w( %#\ +.md .htaccess @@ -268,6 +269,7 @@ class TestSite < JekyllUnitTest test-styles.scss trailing-dots...md ) + # rubocop:enable Style/WordArray unless Utils::Platforms.really_windows? # files in symlinked directories may appear twice sorted_pages.push("main.css.map", "main.scss", "symlinked-file").sort!