parent
1691685c77
commit
ba75c87f63
|
@ -97,7 +97,7 @@ module Jekyll
|
||||||
# problems and backwards-compatibility.
|
# problems and backwards-compatibility.
|
||||||
def from(user_config)
|
def from(user_config)
|
||||||
Utils.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys)
|
Utils.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys)
|
||||||
.fix_common_issues.add_default_collections
|
.add_default_collections
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -210,7 +210,7 @@ module Jekyll
|
||||||
warn err
|
warn err
|
||||||
end
|
end
|
||||||
|
|
||||||
configuration.fix_common_issues.backwards_compatibilize.add_default_collections
|
configuration.backwards_compatibilize.add_default_collections
|
||||||
end
|
end
|
||||||
|
|
||||||
# Public: Split a CSV string into an array containing its values
|
# Public: Split a CSV string into an array containing its values
|
||||||
|
@ -246,18 +246,9 @@ module Jekyll
|
||||||
config
|
config
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# DEPRECATED.
|
||||||
def fix_common_issues
|
def fix_common_issues
|
||||||
config = clone
|
self
|
||||||
|
|
||||||
if config.key?("paginate") && (!config["paginate"].is_a?(Integer) ||
|
|
||||||
config["paginate"] < 1)
|
|
||||||
|
|
||||||
Jekyll.logger.warn "Config Warning:", "The `paginate` key must be a positive" \
|
|
||||||
" integer or nil. It's currently set to '#{config["paginate"].inspect}'."
|
|
||||||
config["paginate"] = nil
|
|
||||||
end
|
|
||||||
|
|
||||||
config
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def add_default_collections
|
def add_default_collections
|
||||||
|
|
|
@ -20,13 +20,8 @@ class TestConfiguration < JekyllUnitTest
|
||||||
assert_equal result["source"], "blah"
|
assert_equal result["source"], "blah"
|
||||||
end
|
end
|
||||||
|
|
||||||
should "fix common mistakes" do
|
should "return a valid Configuration instance" do
|
||||||
result = Configuration.from({ "paginate" => 0 })
|
assert_instance_of Configuration, Configuration.from({}).fix_common_issues
|
||||||
assert_nil(
|
|
||||||
result["paginate"],
|
|
||||||
"Expected 'paginate' to be corrected to 'nil', " \
|
|
||||||
"but was #{result["paginate"].inspect}"
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
should "add default collections" do
|
should "add default collections" do
|
||||||
|
@ -263,20 +258,6 @@ class TestConfiguration < JekyllUnitTest
|
||||||
assert @config.backwards_compatibilize["plugins"]
|
assert @config.backwards_compatibilize["plugins"]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
context "#fix_common_issues" do
|
|
||||||
setup do
|
|
||||||
@config = proc do |val|
|
|
||||||
Configuration[{
|
|
||||||
"paginate" => val,
|
|
||||||
}]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
should "sets an invalid 'paginate' value to nil" do
|
|
||||||
assert_nil @config.call(0).fix_common_issues["paginate"]
|
|
||||||
assert_nil @config.call(-1).fix_common_issues["paginate"]
|
|
||||||
assert_nil @config.call(true).fix_common_issues["paginate"]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
context "loading configuration" do
|
context "loading configuration" do
|
||||||
setup do
|
setup do
|
||||||
@path = source_dir("_config.yml")
|
@path = source_dir("_config.yml")
|
||||||
|
|
Loading…
Reference in New Issue