Permalink
Browse files

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

Merge pull request 7401
  • Loading branch information...
ashmaroli authored and jekyllbot committed Dec 5, 2018
1 parent 5b3eb43 commit eda9e2e4efffdf3534e25210fa9df0ae3d6fef8c
Showing with 19 additions and 19 deletions.
  1. +1 −1 Gemfile
  2. +2 −2 test/test_configuration.rb
  3. +4 −4 test/test_document.rb
  4. +9 −9 test/test_front_matter_defaults.rb
  5. +3 −3 test/test_static_file.rb
@@ -25,7 +25,7 @@ group :test do
gem "nokogiri", "~> 1.7"
gem "rspec"
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-theme", :path => File.expand_path("test/fixtures/test-theme", __dir__)

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

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

result = Configuration[{ "permalink" => nil, "collections" => {} }]
@@ -143,7 +143,7 @@ def setup_document_with_dates(filename)
"key" => "myval",
},
},
},]
}]
)
@site.process
@document = @site.collections["slides"].docs.select { |d| d.is_a?(Document) }.first
@@ -174,7 +174,7 @@ def setup_document_with_dates(filename)
"test2" => "default1",
},
},
},]
}]
)
@site.process
@document = @site.collections["slides"].docs[1]
@@ -201,7 +201,7 @@ def setup_document_with_dates(filename)
"key" => "value123",
},
},
},]
}]
)
@site.process
@document = @site.collections["slides"].docs.first
@@ -225,7 +225,7 @@ def setup_document_with_dates(filename)
"key" => "myval",
},
},
},]
}]
)
@site.process
@document = @site.collections["slides"].docs.first
@@ -14,7 +14,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => {
"key" => "val",
},
},]
}]
)
@output = capture_output { @site.process }
@affected = @site.pages.find { |page| page.relative_path == "contacts/bar.html" }
@@ -42,7 +42,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => {
"key" => "val",
},
},]
}]
)
@output = capture_output { @site.process }
@affected = @site.pages.find { |page| page.relative_path == "contacts/bar.html" }
@@ -69,7 +69,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => {
"key" => "val",
},
},]
}]
)

@site.process
@@ -93,7 +93,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => {
"key" => "val",
},
},]
}]
)

@site.process
@@ -117,7 +117,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => {
"key" => "val",
},
},]
}]
)

@site.process
@@ -142,7 +142,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => {
"key" => "val",
},
},]
}]
)
@site.process
@affected = @site.pages
@@ -165,7 +165,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => {
"key" => "val",
},
},]
}]
)
@site.process
@affected = @site.pages
@@ -185,7 +185,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => {
"key" => "val",
},
},]
}]
)
@site.process
@affected = @site.pages
@@ -207,7 +207,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
"values" => {
"date" => "2015-01-01 00:00:01",
},
},]
}]
))
end

@@ -99,7 +99,7 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
defaults = [{
"scope" => { "path" => "private" },
"values" => { "published" => false },
},]
}]
static_file = setup_static_file_with_defaults(
"root",
"private/dir/subdir",
@@ -115,7 +115,7 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
defaults = [{
"scope" => { "path" => "" },
"values" => { "front-matter" => "default" },
},]
}]

static_file = setup_static_file_with_defaults "", "", "file.pdf", defaults
assert_equal "default", static_file.data["front-matter"]
@@ -125,7 +125,7 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
defaults = [{
"scope" => { "path" => "" },
"values" => { "front-matter" => "default" },
},]
}]

static_file = setup_static_file_with_defaults "", "", "file.pdf", defaults
hash = static_file.to_liquid

0 comments on commit eda9e2e

Please sign in to comment.