diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb
index fb024fa9..5ad896b2 100644
--- a/lib/jekyll/frontmatter_defaults.rb
+++ b/lib/jekyll/frontmatter_defaults.rb
@@ -109,7 +109,7 @@ module Jekyll
sanitized_path = sanitize_path(path)
if rel_scope_path.include?("*")
- File.fnmatch?(strip_collections_dir(rel_scope_path), sanitized_path)
+ glob_scope(sanitized_path, rel_scope_path)
else
path_is_subpath?(sanitized_path, strip_collections_dir(rel_scope_path))
end
diff --git a/test/source/gathering/_staff/admins/backend/gamma.svg b/test/source/gathering/_staff/admins/backend/gamma.svg
deleted file mode 100644
index 861641a7..00000000
--- a/test/source/gathering/_staff/admins/backend/gamma.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/source/gathering/_staff/admins/backend/jack.md b/test/source/gathering/_staff/admins/backend/jack.md
deleted file mode 100644
index d6e5c2a9..00000000
--- a/test/source/gathering/_staff/admins/backend/jack.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-speciality: Ruby
----
diff --git a/test/source/gathering/_staff/admins/frontend/alpha.svg b/test/source/gathering/_staff/admins/frontend/alpha.svg
deleted file mode 100644
index 861641a7..00000000
--- a/test/source/gathering/_staff/admins/frontend/alpha.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/source/gathering/_staff/admins/frontend/john.md b/test/source/gathering/_staff/admins/frontend/john.md
deleted file mode 100644
index cff8a6a4..00000000
--- a/test/source/gathering/_staff/admins/frontend/john.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-speciality: JS Frameworks
----
diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb
index 32180aae..9b7f1b68 100644
--- a/test/test_front_matter_defaults.rb
+++ b/test/test_front_matter_defaults.rb
@@ -25,6 +25,10 @@ class TestFrontMatterDefaults < JekyllUnitTest
assert_equal "val", @affected.data["key"]
assert_nil @not_affected.data["key"]
end
+
+ should "not call Dir.glob block" do
+ refute_includes @output, "Globbed Scope Path:"
+ end
end
context "A site with full front matter defaults (glob)" do
@@ -49,38 +53,9 @@ class TestFrontMatterDefaults < JekyllUnitTest
assert_equal "val", @affected.data["key"]
assert_nil @not_affected.data["key"]
end
- end
- context "A site with collections and front matter defaults with glob patterns" do
- setup do
- site = fixture_site(
- "collections_dir" => "gathering",
- "collections" => { "staff" => { "output" => true } },
- "defaults" => [
- {
- "scope" => { "path" => "_staff/**/*.md", "type" => "staff" },
- "values" => { "layout" => "simple" },
- },
- {
- "scope" => { "path" => "_staff/**/*.svg" },
- "values" => { "css_class" => "epilson" },
- },
- ]
- )
- site.read
- @staff = site.collections["staff"]
- end
-
- should "affect the appropriate items only" do
- @staff.docs.each do |item|
- assert_equal "simple", item.data["layout"]
- assert_nil item.data["css_class"]
- end
-
- @staff.files.each do |item|
- assert_equal "epilson", item.data["css_class"]
- assert_nil item.data["layout"]
- end
+ should "call Dir.glob block" do
+ assert_includes @output, "Globbed Scope Path:"
end
end