Bump RuboCop to v0.61.x (#7401)

Merge pull request 7401
This commit is contained in:
Ashwin Maroli 2018-12-05 21:51:48 +05:30 committed by jekyllbot
parent 5b3eb43e08
commit eda9e2e4ef
5 changed files with 19 additions and 19 deletions

View File

@ -25,7 +25,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.60.0" gem "rubocop", "~> 0.61.0"
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__)

View File

@ -29,7 +29,7 @@ class TestConfiguration < JekyllUnitTest
expected = { "posts" => { expected = { "posts" => {
"output" => true, "output" => true,
"permalink" => "/:categories/:year/:month/:day/:title:output_ext", "permalink" => "/:categories/:year/:month/:day/:title:output_ext",
}, } } }
assert_equal expected, result["collections"] assert_equal expected, result["collections"]
end end
@ -76,7 +76,7 @@ class TestConfiguration < JekyllUnitTest
expected = { "posts" => { expected = { "posts" => {
"output" => true, "output" => true,
"permalink" => "/:categories/:year/:month/:day/:title/", "permalink" => "/:categories/:year/:month/:day/:title/",
}, } } }
assert_equal expected, result["collections"] assert_equal expected, result["collections"]
result = Configuration[{ "permalink" => nil, "collections" => {} }] result = Configuration[{ "permalink" => nil, "collections" => {} }]

View File

@ -143,7 +143,7 @@ class TestDocument < JekyllUnitTest
"key" => "myval", "key" => "myval",
}, },
}, },
},] }]
) )
@site.process @site.process
@document = @site.collections["slides"].docs.select { |d| d.is_a?(Document) }.first @document = @site.collections["slides"].docs.select { |d| d.is_a?(Document) }.first
@ -174,7 +174,7 @@ class TestDocument < JekyllUnitTest
"test2" => "default1", "test2" => "default1",
}, },
}, },
},] }]
) )
@site.process @site.process
@document = @site.collections["slides"].docs[1] @document = @site.collections["slides"].docs[1]
@ -201,7 +201,7 @@ class TestDocument < JekyllUnitTest
"key" => "value123", "key" => "value123",
}, },
}, },
},] }]
) )
@site.process @site.process
@document = @site.collections["slides"].docs.first @document = @site.collections["slides"].docs.first
@ -225,7 +225,7 @@ class TestDocument < JekyllUnitTest
"key" => "myval", "key" => "myval",
}, },
}, },
},] }]
) )
@site.process @site.process
@document = @site.collections["slides"].docs.first @document = @site.collections["slides"].docs.first

View File

@ -14,7 +14,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => { "values" => {
"key" => "val", "key" => "val",
}, },
},] }]
) )
@output = capture_output { @site.process } @output = capture_output { @site.process }
@affected = @site.pages.find { |page| page.relative_path == "contacts/bar.html" } @affected = @site.pages.find { |page| page.relative_path == "contacts/bar.html" }
@ -42,7 +42,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => { "values" => {
"key" => "val", "key" => "val",
}, },
},] }]
) )
@output = capture_output { @site.process } @output = capture_output { @site.process }
@affected = @site.pages.find { |page| page.relative_path == "contacts/bar.html" } @affected = @site.pages.find { |page| page.relative_path == "contacts/bar.html" }
@ -69,7 +69,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => { "values" => {
"key" => "val", "key" => "val",
}, },
},] }]
) )
@site.process @site.process
@ -93,7 +93,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => { "values" => {
"key" => "val", "key" => "val",
}, },
},] }]
) )
@site.process @site.process
@ -117,7 +117,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => { "values" => {
"key" => "val", "key" => "val",
}, },
},] }]
) )
@site.process @site.process
@ -142,7 +142,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => { "values" => {
"key" => "val", "key" => "val",
}, },
},] }]
) )
@site.process @site.process
@affected = @site.pages @affected = @site.pages
@ -165,7 +165,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => { "values" => {
"key" => "val", "key" => "val",
}, },
},] }]
) )
@site.process @site.process
@affected = @site.pages @affected = @site.pages
@ -185,7 +185,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => { "values" => {
"key" => "val", "key" => "val",
}, },
},] }]
) )
@site.process @site.process
@affected = @site.pages @affected = @site.pages
@ -207,7 +207,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => { "values" => {
"date" => "2015-01-01 00:00:01", "date" => "2015-01-01 00:00:01",
}, },
},] }]
)) ))
end end

View File

@ -99,7 +99,7 @@ class TestStaticFile < JekyllUnitTest
defaults = [{ defaults = [{
"scope" => { "path" => "private" }, "scope" => { "path" => "private" },
"values" => { "published" => false }, "values" => { "published" => false },
},] }]
static_file = setup_static_file_with_defaults( static_file = setup_static_file_with_defaults(
"root", "root",
"private/dir/subdir", "private/dir/subdir",
@ -115,7 +115,7 @@ class TestStaticFile < JekyllUnitTest
defaults = [{ defaults = [{
"scope" => { "path" => "" }, "scope" => { "path" => "" },
"values" => { "front-matter" => "default" }, "values" => { "front-matter" => "default" },
},] }]
static_file = setup_static_file_with_defaults "", "", "file.pdf", defaults static_file = setup_static_file_with_defaults "", "", "file.pdf", defaults
assert_equal "default", static_file.data["front-matter"] assert_equal "default", static_file.data["front-matter"]
@ -125,7 +125,7 @@ class TestStaticFile < JekyllUnitTest
defaults = [{ defaults = [{
"scope" => { "path" => "" }, "scope" => { "path" => "" },
"values" => { "front-matter" => "default" }, "values" => { "front-matter" => "default" },
},] }]
static_file = setup_static_file_with_defaults "", "", "file.pdf", defaults static_file = setup_static_file_with_defaults "", "", "file.pdf", defaults
hash = static_file.to_liquid hash = static_file.to_liquid